Bug 481853 - -moz-mac-focusring color isn't quite right. r=josh, sr=roc
authorMarkus Stange <mstange@themasta.com>
Mon, 23 Mar 2009 12:05:46 +0100
changeset 26465 f4f8c4ee8615c839acbc00374a29339eefbde19e
parent 26464 d74e551f46a35dc797249bef10b3e46f9ae3b932
child 26466 811b06e85fc9a2f4b20d10a659c7698538556699
push id6086
push userdgottwald@mozilla.com
push dateMon, 23 Mar 2009 11:07:11 +0000
treeherdermozilla-central@811b06e85fc9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjosh, roc
bugs481853
milestone1.9.2a1pre
Bug 481853 - -moz-mac-focusring color isn't quite right. r=josh, sr=roc
widget/src/cocoa/nsLookAndFeel.mm
--- a/widget/src/cocoa/nsLookAndFeel.mm
+++ b/widget/src/cocoa/nsLookAndFeel.mm
@@ -299,18 +299,18 @@ nsresult nsLookAndFeel::NativeGetColor(c
       break;
     case eColor__moz_mac_chrome_active:
     case eColor__moz_mac_chrome_inactive: {
       int grey = NativeGreyColorAsInt(headerEndGrey, (aID == eColor__moz_mac_chrome_active));
       aColor = NS_RGB(grey, grey, grey);
     }
       break;
     case eColor__moz_mac_focusring:
-      //default to lavender if not available
-      res = GetMacBrushColor(kThemeBrushFocusHighlight, aColor, NS_RGB(0x63,0x63,0xCE));
+      aColor = [NSColor currentControlTint] == NSGraphiteControlTint ?
+               NS_RGB(0x5F,0x70,0x82) : NS_RGB(0x53,0x90,0xD2);
       break;
     case eColor__moz_mac_menushadow:
       res = GetMacBrushColor(kThemeBrushBevelActiveDark, aColor, NS_RGB(0x88,0x88,0x88));
       break;          
     case eColor__moz_mac_menutextdisable:
       res = GetMacTextColor(kThemeTextColorMenuItemDisabled, aColor, NS_RGB(0x99,0x99,0x99));
       break;      
     case eColor__moz_mac_menutextselect: