[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/osx

[Jan Holesovsky]

 vcl/osx/salnativewidgets.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f8fdcfe28859fee61c87e0a6a06f5d8eab82eed4
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Sep 3 20:39:36 2014 +0200

    fdo#80474: Fix the check whether the window is active on OS X.
    
    Change-Id: I68d7d11a93f5d741f2295ef183b2b607ad6833fc
    Reviewed-on: https://gerrit.libreoffice.org/11266
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 61a9838e521222e0aeb3199e18e6d828801a8035)
    Reviewed-on: https://gerrit.libreoffice.org/11267
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 5aebe47..9012321 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -550,14 +550,14 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 #else
             if (rControlRegion.Top() == 0 && nPart == PART_DRAW_BACKGROUND_HORZ)
             {
-                BOOL isMain = [mpFrame->getNSWindow() isMainWindow];
+                const bool bDrawActive = mpFrame ? ([mpFrame->getNSWindow() isKeyWindow] ? true : false) : true;
                 CGFloat unifiedHeight = rControlRegion.GetHeight();
                 CGRect drawRect = CGRectMake(rControlRegion.Left(), rControlRegion.Top(), rControlRegion.GetWidth(), rControlRegion.GetHeight());
                 CUIDraw([NSWindow coreUIRenderer], drawRect, mrContext,
                         (CFDictionaryRef)[NSDictionary dictionaryWithObjectsAndKeys:
                         @"kCUIWidgetWindowFrame", @"widget",
                         @"regularwin", @"windowtype",
-                        (isMain ? @"normal" : @"inactive"), @"state",
+                        (bDrawActive ? @"normal" : @"inactive"), @"state",
                         [NSNumber numberWithDouble:unifiedHeight], @"kCUIWindowFrameUnifiedTitleBarHeightKey",
                         [NSNumber numberWithBool:NO], @"kCUIWindowFrameDrawTitleSeparatorKey",
                         [NSNumber numberWithBool:YES], @"is.flipped",