Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1073)

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_view.mm

Issue 900613003: Mac: Make it easier for views to correctly draw with a theme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gyp
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/tabs/tab_view.mm
diff --git a/chrome/browser/ui/cocoa/tabs/tab_view.mm b/chrome/browser/ui/cocoa/tabs/tab_view.mm
index 640e194c3ad95ac7cdeea79bc8877a4aa0d787f9..34acb5ce95c0abce27b1d2edc48afcffd3787dae 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_view.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_view.mm
@@ -314,8 +314,8 @@ const CGFloat kRapidCloseDist = 2.5;
// Themes don't have an inactive image so only look for one if there's no
// theme.
- bool active = [[self window] isKeyWindow] || [[self window] isMainWindow] ||
- !themeProvider->UsingDefaultTheme();
+ bool active =
+ [[self window] isMainWindow] || !themeProvider->UsingDefaultTheme();
return themeProvider->GetNSImageColorNamed(bitmapResources[active][selected]);
}
@@ -429,7 +429,7 @@ const CGFloat kRapidCloseDist = 2.5;
// Draws the tab outline.
- (void)drawStroke:(NSRect)dirtyRect {
- BOOL focused = [[self window] isKeyWindow] || [[self window] isMainWindow];
+ BOOL focused = [[self window] isMainWindow];
CGFloat alpha = focused ? 1.0 : tabs::kImageNoFocusAlpha;
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@@ -641,6 +641,16 @@ const CGFloat kRapidCloseDist = 2.5;
return VIEW_ID_TAB;
}
+// ThemedWindowDrawing implementation.
+
+- (void)windowDidChangeTheme {
+ [self setNeedsDisplay:YES];
+}
+
+- (void)windowDidChangeActive {
+ [self setNeedsDisplay:YES];
+}
+
@end // @implementation TabView
@implementation TabView (TabControllerInterface)

Powered by Google App Engine
This is Rietveld 408576698