vcl/source/window/winproc.cxx | 10 ++++++++++
1 file changed, 10 insertions(+)
New commits:
commit 67ee8818e68a2793d89331dd715989c468fe5680
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Mon Jul 22 17:26:38 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Dec 10 23:50:17 2019 +0100
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.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/84802
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 ) ||
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
