diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2021-06-21 17:21:11 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-07-28 14:33:19 +0200 |
| commit | 90f9a35319b3fc5db3fb4714a4b78f2c46fb4f28 (patch) | |
| tree | 5e71bbaa06eb13efa89c5ee9b8a0461e91b96470 | |
| parent | 333f0cb495c64439ebd77e86a58297d455b71a13 (diff) | |
Don't steal focus from popup in online
To avoid closing the popup when it is first time activated.
Change-Id: I23abd691ecc271b46f1bfba041f247208200ba7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117595
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119599
Tested-by: Jenkins
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 1f2adef9fdfb..e7d1bcc356e7 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -3849,7 +3849,11 @@ ColorListBox::ColorListBox(std::unique_ptr<weld::MenuButton> pControl, TopLevelP IMPL_LINK(ColorListBox, ToggleHdl, weld::Toggleable&, rButton, void) { if (rButton.get_active()) - getColorWindow()->GrabFocus(); + { + ColorWindow* pColorWindow = getColorWindow(); + if (pColorWindow && !comphelper::LibreOfficeKit::isActive()) + pColorWindow->GrabFocus(); + } } ColorListBox::~ColorListBox() |