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

[Tor Lillqvist (via logerrit)]

 vcl/osx/salframe.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 0af22a7e7088516b37647a9f72943f4ee5b536b4
Author: Tor Lillqvist 
AuthorDate: Sun Jul 5 19:23:27 2020 +0300
Commit: Caolán McNamara 
CommitDate: Tue Nov 24 10:03:12 2020 +0100

Avoid warning about deprecation in macOS 11.0

Change-Id: Ie1a7e19093b439eb133632ee881e1e3dbe58132d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98176
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106459
Reviewed-by: Caolán McNamara 

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 6f7a395522cf..71cc5a4f1982 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1279,8 +1279,11 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
  
aStyleSettings.GetHighlightTextColor(), mpNSWindow ) );
 aStyleSettings.SetHighlightTextColor( aHighlightTextColor );
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 Color aMenuHighlightColor( getColor( [NSColor selectedMenuItemColor],
  
aStyleSettings.GetMenuHighlightColor(), mpNSWindow ) );
+#pragma clang diagnostic pop
 aStyleSettings.SetMenuHighlightColor( aMenuHighlightColor );
 Color aMenuHighlightTextColor( getColor( [NSColor 
selectedMenuItemTextColor],
  
aStyleSettings.GetMenuHighlightTextColor(), mpNSWindow ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[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 
AuthorDate: Sat Aug 1 19:49:38 2020 +0200
Commit: Xisco Fauli 
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 
(cherry picked from commit 4b1ecab984dc46ad7dfdd8a071c94553a6c03633)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99920
Reviewed-by: Xisco Fauli 

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;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits