summaryrefslogtreecommitdiff
path: root/vcl/osx/salframe.cxx
diff options
context:
space:
mode:
authorPatrick Luby <plubius@neooffice.org>2023-05-10 16:15:03 -0400
committerPatrick Luby <plubius@neooffice.org>2023-05-10 23:26:59 +0200
commitbf2cf747303d1485fac44e0d7250541094fe9724 (patch)
tree1c3aa333470626a61c1cd07bff724bcd51834cc5 /vcl/osx/salframe.cxx
parenta580a69a1e579755f726ffcd2a31a6f4f42c7100 (diff)
tdf#152173 Don't display tooltip windows when mousing over non-key windows
Don't display tooltips when mousing over non-key windows even if the application is active as the tooltip window will pull the non-key window in front of the key window. Change-Id: I425b9af09de0272ebee84a218e2e5ae8c200a4e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151646 Tested-by: Jenkins Reviewed-by: Patrick Luby <plubius@neooffice.org>
Diffstat (limited to 'vcl/osx/salframe.cxx')
-rw-r--r--vcl/osx/salframe.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 686f346fb54f..ea514b786ada 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -462,7 +462,10 @@ void AquaSalFrame::Show(bool bVisible, bool bNoActivate)
// parent window (to ensure that the tooltip is above the parent window),
// displaying a tooltip pulls the parent window in front of the windows
// of all other inactive applications.
- if (bVisible && (mnStyle & SalFrameStyleFlags::TOOLTIP) && ![NSApp isActive])
+ // Also, don't display tooltips when mousing over non-key windows even if
+ // the application is active as the tooltip window will pull the non-key
+ // window in front of the key window.
+ if (bVisible && (mnStyle & SalFrameStyleFlags::TOOLTIP) && (![NSApp isActive] || (mpParent && ![ mpParent->mpNSWindow isKeyWindow])))
return;
mbShown = bVisible;