diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-09 23:20:16 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-09 23:20:16 +0000 |
| commit | a28b75289ddab84ce53c419a2887c650bc206d4a (patch) | |
| tree | d50d2650f0b2c43529a822e9bc739bc406d289b4 /chrome/browser/ui/cocoa/background_gradient_view.mm | |
| parent | 79e02eae6dfcb1e3f95b5350346afafc491bc830 (diff) | |
| download | chromium_src-a28b75289ddab84ce53c419a2887c650bc206d4a.zip chromium_src-a28b75289ddab84ce53c419a2887c650bc206d4a.tar.gz chromium_src-a28b75289ddab84ce53c419a2887c650bc206d4a.tar.bz2 | |
Mac: Fix check for active window
The toolbar and download shelf drawing code was looking at -[NSWindow isKeyWindow] to check if the window was active. This was incorrect becasue a window may look active even if another window has keyboard focus (for example, a sheet).
Fix was to use -[NSWindow isMainWindow] instead.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6928041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/background_gradient_view.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/background_gradient_view.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/cocoa/background_gradient_view.mm b/chrome/browser/ui/cocoa/background_gradient_view.mm index f0a72a0..fc65b86 100644 --- a/chrome/browser/ui/cocoa/background_gradient_view.mm +++ b/chrome/browser/ui/cocoa/background_gradient_view.mm @@ -60,13 +60,13 @@ } - (NSColor*)strokeColor { - BOOL isKey = [[self window] isKeyWindow]; + BOOL isActive = [[self window] isMainWindow]; ui::ThemeProvider* themeProvider = [[self window] themeProvider]; if (!themeProvider) return [NSColor blackColor]; return themeProvider->GetNSColor( - isKey ? ThemeService::COLOR_TOOLBAR_STROKE : - ThemeService::COLOR_TOOLBAR_STROKE_INACTIVE, true); + isActive ? ThemeService::COLOR_TOOLBAR_STROKE : + ThemeService::COLOR_TOOLBAR_STROKE_INACTIVE, true); } - (NSColor*)backgroundImageColor { @@ -77,7 +77,7 @@ // Themes don't have an inactive image so only look for one if there's no // theme. - if (![[self window] isKeyWindow] && themeProvider->UsingDefaultTheme()) { + if (![[self window] isMainWindow] && themeProvider->UsingDefaultTheme()) { NSColor* color = themeProvider->GetNSImageColorNamed( IDR_THEME_TOOLBAR_INACTIVE, true); if (color) |