diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2018-01-25 14:34:19 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-01-25 11:10:48 +0100 |
| commit | 3b22b8077d744f39ca5c202570d21f2f32f02b45 (patch) | |
| tree | e9cb9862928c4a8c83d836eaf381114cd8cdcd57 /vcl | |
| parent | e183338d2aef0f976aaadd52e76ff9c478f92cdc (diff) | |
lokdialog: Fix incorrect dialog sizes sent to client
GetSizePixel triggers pending resize handler and gives more correct
sizes than GetOptimalSize(). Some of the dialog with inconsistencies in
sizes like EditStyle, Manage Changes, etc. are fixed with this patch.
Change-Id: I0661b7d2e98233edf0cd2c9c525b271d0724da08
(cherry picked from commit 668deca97d8dd049bb17b6d8b73c4ea73f7b8b9c)
Reviewed-on: https://gerrit.libreoffice.org/48560
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index d2d20d1ef7cd..f9dbaa534f5f 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -895,10 +895,9 @@ bool Dialog::ImplStartExecuteModal() { if(const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) { - const Size aSize = GetOptimalSize(); std::vector<vcl::LOKPayloadItem> aItems; aItems.emplace_back("type", "dialog"); - aItems.emplace_back("size", aSize.toString()); + aItems.emplace_back("size", GetSizePixel().toString()); if (!GetText().isEmpty()) aItems.emplace_back("title", GetText().toUtf8()); pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems); @@ -1284,7 +1283,7 @@ void Dialog::Resize() if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) { std::vector<vcl::LOKPayloadItem> aItems; - aItems.emplace_back("size", GetOptimalSize().toString()); + aItems.emplace_back("size", GetSizePixel().toString()); pNotifier->notifyWindow(GetLOKWindowId(), "size_changed", aItems); } } |