[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/osx

[Thorsten Wagner (via logerrit)]

 vcl/osx/salnativewidgets.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit cb8bf2cea598b48783e2d7d60ef711ec438719a4
Author:     Thorsten Wagner <thorsten.wagner.4 at gmail.com>
AuthorDate: Sat Aug 1 19:49:38 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Sep 2 12:22:34 2020 +0200

    tdf#133564: Text coloring of buttons within non key windows on macOS amended
    
    Change-Id: I815fcf82440a7e5d14ae457cc659a5fe6a9f8c52
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99946
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 4b1ecab984dc46ad7dfdd8a071c94553a6c03633)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99920
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 230735401993..54e2cde82e23 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -232,7 +232,12 @@ bool AquaSalGraphics::hitTestNativeControl(ControlType nType, ControlPart nPart,
 
 UInt32 AquaSalGraphics::getState(ControlState nState)
 {
-    const bool bDrawActive = mpFrame == nullptr || [mpFrame->getNSWindow() isKeyWindow];
+
+    // there are non key windows which are childs of key windows, e.g. autofilter configuration dialog or sidebar dropdown dialogs.
+    // To handle these windows correctly, parent frame's key window state is considered here additionally.
+
+    const bool bDrawActive = mpFrame == nullptr || [mpFrame->getNSWindow() isKeyWindow]
+                             || mpFrame->mpParent == nullptr || [mpFrame->mpParent->getNSWindow() isKeyWindow];
     if (!(nState & ControlState::ENABLED) || !bDrawActive)
     {
         return kThemeStateInactive;