OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #import "chrome/browser/ui/cocoa/framed_browser_window.h" | 5 #import "chrome/browser/ui/cocoa/framed_browser_window.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "chrome/browser/global_keyboard_shortcuts_mac.h" | 8 #include "chrome/browser/global_keyboard_shortcuts_mac.h" |
9 #import "chrome/browser/ui/cocoa/browser_frame_view.h" | 9 #import "chrome/browser/ui/cocoa/browser_frame_view.h" |
10 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 10 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 oldButton = [self standardWindowButton:NSWindowMiniaturizeButton]; | 111 oldButton = [self standardWindowButton:NSWindowMiniaturizeButton]; |
112 [oldButton setHidden:YES]; | 112 [oldButton setHidden:YES]; |
113 oldButton = [self standardWindowButton:NSWindowZoomButton]; | 113 oldButton = [self standardWindowButton:NSWindowZoomButton]; |
114 [oldButton setHidden:YES]; | 114 [oldButton setHidden:YES]; |
115 | 115 |
116 // Create and position our new buttons. | 116 // Create and position our new buttons. |
117 NSUInteger aStyle = [self styleMask]; | 117 NSUInteger aStyle = [self styleMask]; |
118 closeButton_ = [NSWindow standardWindowButton:NSWindowCloseButton | 118 closeButton_ = [NSWindow standardWindowButton:NSWindowCloseButton |
119 forStyleMask:aStyle]; | 119 forStyleMask:aStyle]; |
120 NSRect closeButtonFrame = [closeButton_ frame]; | 120 NSRect closeButtonFrame = [closeButton_ frame]; |
| 121 CGFloat xOffset = [browserController hasTabStrip] ? |
| 122 kFramedWindowButtonsWithTabStripOffsetFromLeft : |
| 123 kFramedWindowButtonsWithoutTabStripOffsetFromLeft; |
121 CGFloat yOffset = [browserController hasTabStrip] ? | 124 CGFloat yOffset = [browserController hasTabStrip] ? |
122 kFramedWindowButtonsWithTabStripOffsetFromTop : | 125 kFramedWindowButtonsWithTabStripOffsetFromTop : |
123 kFramedWindowButtonsWithoutTabStripOffsetFromTop; | 126 kFramedWindowButtonsWithoutTabStripOffsetFromTop; |
124 closeButtonFrame.origin = | 127 closeButtonFrame.origin = |
125 NSMakePoint(kFramedWindowButtonsOffsetFromLeft, | 128 NSMakePoint(xOffset, (NSHeight(frameViewBounds) - |
126 (NSHeight(frameViewBounds) - | 129 NSHeight(closeButtonFrame) - yOffset)); |
127 NSHeight(closeButtonFrame) - yOffset)); | |
128 | 130 |
129 [closeButton_ setFrame:closeButtonFrame]; | 131 [closeButton_ setFrame:closeButtonFrame]; |
130 [closeButton_ setTarget:self]; | 132 [closeButton_ setTarget:self]; |
131 [closeButton_ setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin]; | 133 [closeButton_ setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin]; |
132 [frameView addSubview:closeButton_]; | 134 [frameView addSubview:closeButton_]; |
133 | 135 |
134 miniaturizeButton_ = | 136 miniaturizeButton_ = |
135 [NSWindow standardWindowButton:NSWindowMiniaturizeButton | 137 [NSWindow standardWindowButton:NSWindowMiniaturizeButton |
136 forStyleMask:aStyle]; | 138 forStyleMask:aStyle]; |
137 NSRect miniaturizeButtonFrame = [miniaturizeButton_ frame]; | 139 NSRect miniaturizeButtonFrame = [miniaturizeButton_ frame]; |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
341 // return the original (unconstrained) frame. | 343 // return the original (unconstrained) frame. |
342 id delegate = [self delegate]; | 344 id delegate = [self delegate]; |
343 if ([delegate respondsToSelector:@selector(shouldConstrainFrameRect)] && | 345 if ([delegate respondsToSelector:@selector(shouldConstrainFrameRect)] && |
344 ![delegate shouldConstrainFrameRect]) | 346 ![delegate shouldConstrainFrameRect]) |
345 return frame; | 347 return frame; |
346 | 348 |
347 return [super constrainFrameRect:frame toScreen:screen]; | 349 return [super constrainFrameRect:frame toScreen:screen]; |
348 } | 350 } |
349 | 351 |
350 @end | 352 @end |
OLD | NEW |