summaryrefslogtreecommitdiff
path: root/vcl/source/window/winproc.cxx
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2019-07-22 17:26:38 +0200
committerAndras Timar <andras.timar@collabora.com>2019-12-10 23:50:17 +0100
commit67ee8818e68a2793d89331dd715989c468fe5680 (patch)
treebf15d21098c8447cb7c9668716598309529cfcac /vcl/source/window/winproc.cxx
parentbb3865c96f3a12f6b9e9b551e5f68a2731e3deb4 (diff)
lok: don't show tooltip for popup menus inside dialogs
Check Character Properties dialog -> Font Effects -> Font Color popup button. Moving the mouse above the colors, a tooltip is shown with the color name. However when the tooltip window is displayed LO online closes the popup window unexpectedly. Change-Id: I4bb8611640e122fc8187271c8c843c9f29fc0ce0 Reviewed-on: https://gerrit.libreoffice.org/84716 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/84802
Diffstat (limited to 'vcl/source/window/winproc.cxx')
-rw-r--r--vcl/source/window/winproc.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 62214fac59e4..6f50e85699e8 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -157,6 +157,16 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rMousePo
static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point& rMousePos )
{
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ // Ignore tooltips in popup color palettes
+ // (e.g. Character Properties dialog -> Font Effects -> Font Color)
+ if(pChild->GetType() == WindowType::CONTROL &&
+ pChild->GetParent() && pChild->GetParent()->GetParent() &&
+ pChild->GetParent()->GetParent()->GetType() == WindowType::DOCKINGWINDOW)
+ return;
+ }
+
ImplSVData* pSVData = ImplGetSVData();
if ( !pSVData->maHelpData.mpHelpWin ||
!( pSVData->maHelpData.mpHelpWin->IsWindowOrChild( pChild ) ||