diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 18:20:49 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 18:20:49 +0000 |
| commit | e966b8943fa470a6dc085324c1fb461137655e7f (patch) | |
| tree | 313a0624eaed1af9b5f7c68e4c520c26469d5d7b /chrome/browser/ui | |
| parent | 079cac73023474c067653ed9da974b938acf53fb (diff) | |
| download | chromium_src-e966b8943fa470a6dc085324c1fb461137655e7f.zip chromium_src-e966b8943fa470a6dc085324c1fb461137655e7f.tar.gz chromium_src-e966b8943fa470a6dc085324c1fb461137655e7f.tar.bz2 | |
Revert 70621 - With the Mac App Store, we see that window controls are no longer tied to the top of the window. Adjust ours downward so they have space to breathe.
BUG=68746
TEST=window widgets are vertically centered
Review URL: http://codereview.chromium.org/6126001
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6129001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/cocoa/framed_browser_window.h | 16 | ||||
| -rw-r--r-- | chrome/browser/ui/cocoa/framed_browser_window.mm | 8 | ||||
| -rw-r--r-- | chrome/browser/ui/cocoa/tab_strip_controller.mm | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/ui/cocoa/framed_browser_window.h b/chrome/browser/ui/cocoa/framed_browser_window.h index d3fd68b..40f330c 100644 --- a/chrome/browser/ui/cocoa/framed_browser_window.h +++ b/chrome/browser/ui/cocoa/framed_browser_window.h @@ -11,15 +11,17 @@ #include "base/scoped_nsobject.h" #include "chrome/browser/ui/cocoa/chrome_browser_window.h" -// Offsets from the top/left of the window frame to the top of the window -// controls (zoom, close, miniaturize) for a window with a tabstrip. -const NSInteger kFramedWindowButtonsWithTabStripOffsetFromTop = 10; -const NSInteger kFramedWindowButtonsWithTabStripOffsetFromLeft = 10; +// Offset from the top of the window frame to the top of the window controls +// (zoom, close, miniaturize) for a window with a tabstrip. +const NSInteger kFramedWindowButtonsWithTabStripOffsetFromTop = 6; -// Offsets from the top/left of the window frame to the top of the window -// controls (zoom, close, miniaturize) for a window without a tabstrip. +// Offset from the top of the window frame to the top of the window controls +// (zoom, close, miniaturize) for a window without a tabstrip. const NSInteger kFramedWindowButtonsWithoutTabStripOffsetFromTop = 4; -const NSInteger kFramedWindowButtonsWithoutTabStripOffsetFromLeft = 8; + +// Offset from the left of the window frame to the top of the window controls +// (zoom, close, miniaturize). +const NSInteger kFramedWindowButtonsOffsetFromLeft = 8; // Offset between the window controls (zoom, close, miniaturize). const NSInteger kFramedWindowButtonsInterButtonSpacing = 7; diff --git a/chrome/browser/ui/cocoa/framed_browser_window.mm b/chrome/browser/ui/cocoa/framed_browser_window.mm index 46b3a98..9d63cb7 100644 --- a/chrome/browser/ui/cocoa/framed_browser_window.mm +++ b/chrome/browser/ui/cocoa/framed_browser_window.mm @@ -118,15 +118,13 @@ namespace { closeButton_ = [NSWindow standardWindowButton:NSWindowCloseButton forStyleMask:aStyle]; NSRect closeButtonFrame = [closeButton_ frame]; - CGFloat xOffset = [browserController hasTabStrip] ? - kFramedWindowButtonsWithTabStripOffsetFromLeft : - kFramedWindowButtonsWithoutTabStripOffsetFromLeft; CGFloat yOffset = [browserController hasTabStrip] ? kFramedWindowButtonsWithTabStripOffsetFromTop : kFramedWindowButtonsWithoutTabStripOffsetFromTop; closeButtonFrame.origin = - NSMakePoint(xOffset, (NSHeight(frameViewBounds) - - NSHeight(closeButtonFrame) - yOffset)); + NSMakePoint(kFramedWindowButtonsOffsetFromLeft, + (NSHeight(frameViewBounds) - + NSHeight(closeButtonFrame) - yOffset)); [closeButton_ setFrame:closeButtonFrame]; [closeButton_ setTarget:self]; diff --git a/chrome/browser/ui/cocoa/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tab_strip_controller.mm index d9fb6fc..fa9f037 100644 --- a/chrome/browser/ui/cocoa/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tab_strip_controller.mm @@ -430,7 +430,7 @@ private: + (CGFloat)defaultIndentForControls { // Default indentation leaves enough room so tabs don't overlap with the // window controls. - return 68.0; + return 64.0; } // Finds the TabContentsController associated with the given index into the tab |