summaryrefslogtreecommitdiff
path: root/vcl
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-09 16:37:15 +0100
commit20db668fe98ed2a90387393dd1a965b80d5fdd9f (patch)
treeb7cab850070398d5f501bff1ae06e012430851ce /vcl
parent5700f6173c3a7f30011b44d960b10a983726b3ec (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>
Diffstat (limited to 'vcl')
-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 56ffa108812d..26b0f5d33531 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -160,6 +160,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 pallets
+ // (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 ) ||