vcl/osx/salnativewidgets.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7e7af0658d9c769d9e5b3614e5f3fef3187ea833
Author: Thorsten Wagner <thorsten.wagne...@gmail.com>
AuthorDate: Thu Aug 13 10:57:59 2020 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Sep 2 12:21:53 2020 +0200
tdf#133564: Text coloring of buttons within non key windows on macOS
reworked
Change-Id: Ida31f59c853eb3312175cd6dd99b7b1006e014a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100650
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index e01470a58e76..7776009e9704 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -237,7 +237,7 @@ UInt32 AquaSalGraphics::getState(ControlState nState)
// 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]);
+ || mpFrame->mpParent == nullptr ||
[mpFrame->mpParent->getNSWindow() isKeyWindow];
if (!(nState & ControlState::ENABLED) || !bDrawActive)
{
return kThemeStateInactive;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
