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

Unified Diff: ui/gfx/mac/nswindow_frame_controls.mm

Issue 1053303003: [MacViews] Implement colored window frames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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: ui/gfx/mac/nswindow_frame_controls.mm
diff --git a/ui/gfx/mac/nswindow_frame_controls.mm b/ui/gfx/mac/nswindow_frame_controls.mm
index 34f7d266516c823bc53ea6f612eee9dc22446057..1076f2a5f989b3a2c910cdbd27dc5240e0b6e027 100644
--- a/ui/gfx/mac/nswindow_frame_controls.mm
+++ b/ui/gfx/mac/nswindow_frame_controls.mm
@@ -6,8 +6,35 @@
#import "base/mac/mac_util.h"
#import "base/mac/sdk_forward_declarations.h"
+#import "skia/ext/skia_utils_mac.h"
#include "ui/gfx/geometry/size.h"
+@implementation TitlebarBackgroundView
+
+- (void)drawRect:(NSRect)rect {
+ // Only the top corners are rounded. For simplicity, round all 4 corners but
+ // draw the bottom corners outside of the visible bounds.
+ CGFloat cornerRadius = 4.0;
+ NSRect roundedRect = [self bounds];
+ roundedRect.origin.y -= cornerRadius;
+ roundedRect.size.height += cornerRadius;
+ [[NSBezierPath bezierPathWithRoundedRect:roundedRect
+ xRadius:cornerRadius
+ yRadius:cornerRadius] addClip];
+ if ([[self window] isMainWindow] || [[self window] isKeyWindow])
+ [color_ set];
+ else
+ [inactiveColor_ set];
+ NSRectFill(rect);
+}
+
+- (void)setColor:(NSColor*)color inactiveColor:(NSColor*)inactiveColor {
+ color_.reset([color retain]);
+ inactiveColor_.reset([inactiveColor retain]);
+}
+
+@end
+
namespace {
// The value used to represent an unbounded width or height.
@@ -60,4 +87,28 @@ void ApplyNSWindowSizeConstraints(NSWindow* window,
[[window standardWindowButton:NSWindowZoomButton] setEnabled:can_fullscreen];
}
+void AddColoredTitlebarToNSWindow(NSWindow* window,
tapted 2015/05/06 02:58:29 Can this go in chrome/browser/ui/apps ? I don't th
jackhou1 2015/05/12 05:39:05 Moved to titlebar_background_view.h|mm
+ SkColor active_color,
+ SkColor inactive_color) {
+ // AppKit only officially supports adding subviews to the window's
+ // contentView and not its superview (an NSNextStepFrame). The 10.10 SDK
+ // allows adding an NSTitlebarAccessoryViewController to a window, but the
+ // view can only be placed above the window control buttons, so we'd have to
+ // replicate those.
+ NSView* window_view = [[window contentView] superview];
+ CGFloat height =
+ NSHeight([window_view bounds]) - NSHeight([[window contentView] bounds]);
+ base::scoped_nsobject<TitlebarBackgroundView> titlebar_background_view(
+ [[TitlebarBackgroundView alloc]
+ initWithFrame:NSMakeRect(0, NSMaxY([window_view bounds]) - height,
+ NSWidth([window_view bounds]), height)]);
+ [titlebar_background_view
+ setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin];
+ [window_view addSubview:titlebar_background_view
+ positioned:NSWindowBelow
+ relativeTo:nil];
+ [titlebar_background_view setColor:gfx::SkColorToSRGBNSColor(active_color)
+ inactiveColor:gfx::SkColorToSRGBNSColor(inactive_color)];
+}
+
} // namespace gfx
« ui/gfx/mac/nswindow_frame_controls.h ('K') | « ui/gfx/mac/nswindow_frame_controls.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698