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

Unified Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm

Issue 11077006: Correct padding and focus ring for frameless constrained window dialog (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address sail@ comment for mac usage of constants Created 8 years, 2 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/constrained_window/constrained_window_alert.mm
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm
index 05e326add109a876ab3bfce84437aa41ccf78582..fd251dec35ae74861f3dbeeed24bc71f37f48195 100644
--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm
+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.mm
@@ -145,7 +145,7 @@ const CGFloat kButtonMinWidth = 72;
// Layout controls.
[self layoutButtonsWithWindowWidth:windowWidth];
CGFloat curY = [buttons_ count] ? NSMaxY([[buttons_ lastObject] frame])
- : ConstrainedWindow::kVerticalPadding;
+ : ConstrainedWindow::kClientBottomPadding;
curY = [self layoutAccessoryViewAtYPos:curY];
curY = [self layoutTextField:informativeTextField_
yPos:curY
@@ -158,7 +158,7 @@ const CGFloat kButtonMinWidth = 72;
[self layoutCloseButtonWithWindowWidth:windowWidth];
// Update window frame.
- curY += ConstrainedWindow::kVerticalPadding;
+ curY += ConstrainedWindow::kTitleTopPadding;
[window_ setFrame:NSMakeRect(0, 0, windowWidth, curY)
display:NO];
}
@@ -171,7 +171,7 @@ const CGFloat kButtonMinWidth = 72;
NSButton* button = [buttons_ objectAtIndex:i];
NSRect rect = [button frame];
rect.origin.x = curX - NSWidth(rect);
- rect.origin.y = ConstrainedWindow::kVerticalPadding;
+ rect.origin.y = ConstrainedWindow::kClientBottomPadding;
[button setFrameOrigin:rect.origin];
curX = NSMinX(rect) - kButtonGap;
}
@@ -181,7 +181,7 @@ const CGFloat kButtonMinWidth = 72;
for (int i = buttonCount - 1; i >= 2; --i) {
NSButton* button = [buttons_ objectAtIndex:i];
[button setFrameOrigin:
- NSMakePoint(curX, ConstrainedWindow::kVerticalPadding)];
+ NSMakePoint(curX, ConstrainedWindow::kClientBottomPadding)];
curX += NSMaxX([button frame]) + kButtonGap;
}
}

Powered by Google App Engine
This is Rietveld 408576698