diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2018-01-25 14:34:19 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-23 00:01:02 +0100 |
| commit | 41edbd19a8e6710802618b32479fc363f6862a85 (patch) | |
| tree | 4cb178f8b0ee7d9aa0eb913345752cdf8f1d0d93 /sfx2 | |
| parent | e2e0ec0a01b5cb3f13349d364db9e643a7a1b295 (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)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 32ba042b8b76..6d5319ed7b52 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -193,10 +193,9 @@ void SfxModalDialog::StateChanged( StateChangedType nType ) // SfxModalDialog even though they are modeless, i.e., their Execute method // isn't called. SetLOKNotifier(SfxViewShell::Current()); - 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()); SfxViewShell::Current()->notifyWindow(GetLOKWindowId(), "created", aItems); @@ -259,7 +258,7 @@ void SfxModelessDialog::StateChanged( StateChangedType nStateChange ) SetLOKNotifier(pViewShell); std::vector<vcl::LOKPayloadItem> aItems; aItems.emplace_back("type", "dialog"); - aItems.emplace_back("size", GetOptimalSize().toString()); + aItems.emplace_back("size", GetSizePixel().toString()); if (!GetText().isEmpty()) aItems.emplace_back("title", GetText().toUtf8()); pViewShell->notifyWindow(GetLOKWindowId(), "created", aItems); |