vcl/source/window/dialog.cxx | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 1f05243e16eff3849078a47be4e9b49eae9e5954
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
AuthorDate: Sat Jan 5 09:12:25 2019 -0500
Commit: Ashod Nakashian <ashnak...@gmail.com>
CommitDate: Fri Jan 18 11:17:09 2019 +0100
vcl: LOK: notify of dialog creation before size change
Notifying the size change of a non-existing dialog is
worse than useless. This also fixes the issue with
positioning dialogs in the center of the client window.
Change-Id: I2e8163f4c5a0a09f79ea11c704c250b17a158948
Reviewed-on: https://gerrit.libreoffice.org/66517
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 3ea4a14466cc..2bc62fbc00ee 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -846,6 +846,19 @@ bool Dialog::ImplStartExecuteModal()
std::abort();
}
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ if(const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
+ {
+ std::vector<vcl::LOKPayloadItem> aItems;
+ aItems.emplace_back("type", "dialog");
+ aItems.emplace_back("size", GetSizePixel().toString());
+ if (!GetText().isEmpty())
+ aItems.emplace_back("title", GetText().toUtf8());
+ pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
+ }
+ }
+
#ifdef DBG_UTIL
vcl::Window* pParent = GetParent();
if ( pParent )
@@ -898,19 +911,6 @@ bool Dialog::ImplStartExecuteModal()
xEventBroadcaster->documentEventOccured(aObject);
UITestLogger::getInstance().log("DialogExecute");
- if (comphelper::LibreOfficeKit::isActive())
- {
- if(const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
- {
- std::vector<vcl::LOKPayloadItem> aItems;
- aItems.emplace_back("type", "dialog");
- aItems.emplace_back("size", GetSizePixel().toString());
- if (!GetText().isEmpty())
- aItems.emplace_back("title", GetText().toUtf8());
- pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
- }
- }
-
return true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
