summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2021-06-21 17:21:11 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2021-06-28 10:12:33 +0200
commit111ad7f47e4512b2d9efeda058f601bd4b61a861 (patch)
tree68c26aced7fe62edba01a1355fdd715ae2b927e4
parent653c2ff3e76e8f83d39d6e0f034aa7834ac7a7c1 (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>
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 445e557bb57e..8f8055352695 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, weld::Win
IMPL_LINK(ColorListBox, ToggleHdl, weld::ToggleButton&, rButton, void)
{
if (rButton.get_active())
- getColorWindow()->GrabFocus();
+ {
+ ColorWindow* pColorWindow = getColorWindow();
+ if (pColorWindow && !comphelper::LibreOfficeKit::isActive())
+ pColorWindow->GrabFocus();
+ }
}
ColorListBox::~ColorListBox()