From 6c280f30b3bd30875a822f1c69ee68734aea32d8 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Mon, 9 May 2011 16:15:20 +0000 Subject: Fix window button spacing. BUG=81836 TEST=as in bug Review URL: http://codereview.chromium.org/6956008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84625 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/cocoa/framed_browser_window.mm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'chrome/browser/ui/cocoa/framed_browser_window.mm') diff --git a/chrome/browser/ui/cocoa/framed_browser_window.mm b/chrome/browser/ui/cocoa/framed_browser_window.mm index 539c9ff..e15481a 100644 --- a/chrome/browser/ui/cocoa/framed_browser_window.mm +++ b/chrome/browser/ui/cocoa/framed_browser_window.mm @@ -66,6 +66,9 @@ const CGFloat kWindowGradientHeight = 24.0; zoomButton_ = [self standardWindowButton:NSWindowZoomButton]; [zoomButton_ setPostsFrameChangedNotifications:YES]; + windowButtonsInterButtonSpacing_ = + NSMinX([miniaturizeButton_ frame]) - NSMaxX([closeButton_ frame]); + NSNotificationCenter* center = [NSNotificationCenter defaultCenter]; [center addObserver:self selector:@selector(adjustCloseButton:) @@ -152,11 +155,11 @@ const CGFloat kWindowGradientHeight = 24.0; switch (kind) { case NSWindowZoomButton: buttonFrame.origin.x += NSWidth([miniaturizeButton_ frame]); - buttonFrame.origin.x += kFramedWindowButtonsInterButtonSpacing; + buttonFrame.origin.x += windowButtonsInterButtonSpacing_; // fallthrough case NSWindowMiniaturizeButton: buttonFrame.origin.x += NSWidth([closeButton_ frame]); - buttonFrame.origin.x += kFramedWindowButtonsInterButtonSpacing; + buttonFrame.origin.x += windowButtonsInterButtonSpacing_; // fallthrough default: break; @@ -252,6 +255,10 @@ const CGFloat kWindowGradientHeight = 24.0; return shouldHideTitle_; } +- (CGFloat)windowButtonsInterButtonSpacing { + return windowButtonsInterButtonSpacing_; +} + // This method is called whenever a window is moved in order to ensure it fits // on the screen. We cannot always handle resizes without breaking, so we // prevent frame constraining in those cases. -- cgit v1.1