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

Unified Diff: chrome/browser/ui/cocoa/gradient_button_cell.mm

Issue 2013523005: [Mac][Material Design] Bring bookmark hover state, etc. up to spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo, fix chevron button highlight state. Created 4 years, 7 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
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/gradient_button_cell.mm
diff --git a/chrome/browser/ui/cocoa/gradient_button_cell.mm b/chrome/browser/ui/cocoa/gradient_button_cell.mm
index fd343289cf48e90ade5615f57be2021c6c1789a5..99814003402c13c6a4e21caf17d2bde5d2fdb4d4 100644
--- a/chrome/browser/ui/cocoa/gradient_button_cell.mm
+++ b/chrome/browser/ui/cocoa/gradient_button_cell.mm
@@ -377,7 +377,8 @@ static const NSTimeInterval kAnimationContinuousCycleDuration = 0.4;
// The alpha is always at least 8%. Default the color to black.
CGFloat alpha = kEightPercentAlpha;
CGFloat color = 0.0;
- // If a dark theme, incrase the opacity slightly and use white.
+
+ // If a dark theme, increase the opacity slightly and use white.
if ([[controlView window] hasDarkTheme]) {
alpha += kFourPercentAlpha;
color = 1.0;
@@ -513,12 +514,19 @@ static const NSTimeInterval kAnimationContinuousCycleDuration = 0.4;
const CGFloat kLineWidth = [controlView cr_lineWidth];
const CGFloat kHalfLineWidth = kLineWidth / 2.0;
- NSRect drawFrame = cellFrame;
- NSRect innerFrame = NSInsetRect(cellFrame, kLineWidth, kLineWidth);
+ NSRect drawFrame = NSZeroRect;
+ NSRect innerFrame = NSZeroRect;
CGFloat cornerRadius = 2;
if ([self tag] != kMaterialStandardButtonTypeWithLimitedClickFeedback) {
drawFrame = NSInsetRect(cellFrame, 1.5 * kLineWidth, 1.5 * kLineWidth);
+ innerFrame = NSInsetRect(cellFrame, kLineWidth, kLineWidth);
cornerRadius = 3;
+ } else {
+ drawFrame = cellFrame;
+ // Hover and click paths are always 20pt tall, regardless of the button's
+ // height.
+ drawFrame.size.height = 20;
+ innerFrame = NSInsetRect(drawFrame, kLineWidth, kLineWidth);
}
ButtonType type = [[(NSControl*)controlView cell] tag];
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698