diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-10 22:54:52 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-10 22:54:52 +0000 |
| commit | 4266ed9c0542308842a1002773c501d016e90bae (patch) | |
| tree | 56c0b7b32fd69d25e02196325795381da65fbdb4 | |
| parent | 142bd00972d6e92a885dfdfcbf6bc9d1d4207693 (diff) | |
| download | chromium_src-4266ed9c0542308842a1002773c501d016e90bae.zip chromium_src-4266ed9c0542308842a1002773c501d016e90bae.tar.gz chromium_src-4266ed9c0542308842a1002773c501d016e90bae.tar.bz2 | |
Merge 96183 - Fix up close button on mac not centering vertically in the download shelf in fullscreen.
BUG=91716
TEST=Download something. Hit cmd-shift-f for fullscreen. close box should stay centered
vertically.
Review URL: http://codereview.chromium.org/7598002
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/7613010
git-svn-id: svn://svn.chromium.org/chrome/branches/835/src@96241 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/hover_close_button.mm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/chrome/browser/ui/cocoa/hover_close_button.mm b/chrome/browser/ui/cocoa/hover_close_button.mm index f666c9b..53aba4f 100644 --- a/chrome/browser/ui/cocoa/hover_close_button.mm +++ b/chrome/browser/ui/cocoa/hover_close_button.mm @@ -135,19 +135,26 @@ NSString* const kFadeOutValueKeyPath = @"fadeOutValue"; } - (void)drawRect:(NSRect)dirtyRect { + // Close boxes align left horizontally, and align center vertically. + // http:crbug.com/14739 requires this. NSRect imageRect = NSZeroRect; imageRect.size = [gHoverMouseOverImage size]; + NSRect destRect = [self bounds]; + destRect.origin.y = floor((NSHeight(destRect) / 2) + - (NSHeight(imageRect) / 2)); + destRect.size = imageRect.size; + switch(self.hoverState) { case kHoverStateMouseOver: - [gHoverMouseOverImage drawInRect:imageRect + [gHoverMouseOverImage drawInRect:destRect fromRect:imageRect operation:NSCompositeSourceOver fraction:1.0]; break; case kHoverStateMouseDown: - [gHoverMouseDownImage drawInRect:imageRect + [gHoverMouseDownImage drawInRect:destRect fromRect:imageRect operation:NSCompositeSourceOver fraction:1.0]; @@ -164,12 +171,12 @@ NSString* const kFadeOutValueKeyPath = @"fadeOutValue"; } else { previousImage = gHoverMouseDownImage; } - [previousImage drawInRect:imageRect + [previousImage drawInRect:destRect fromRect:imageRect operation:NSCompositeSourceOver fraction:1.0 - value]; } - [gHoverNoneImage drawInRect:imageRect + [gHoverNoneImage drawInRect:destRect fromRect:imageRect operation:NSCompositeSourceOver fraction:value]; |