Commit 2d77e523 authored by dmaclach@chromium.org's avatar dmaclach@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96183 0039d316-1c4b-4281-b951-d872f2087c98
parent caf93e93
...@@ -135,19 +135,26 @@ NSString* const kFadeOutValueKeyPath = @"fadeOutValue"; ...@@ -135,19 +135,26 @@ NSString* const kFadeOutValueKeyPath = @"fadeOutValue";
} }
- (void)drawRect:(NSRect)dirtyRect { - (void)drawRect:(NSRect)dirtyRect {
// Close boxes align left horizontally, and align center vertically.
// http:crbug.com/14739 requires this.
NSRect imageRect = NSZeroRect; NSRect imageRect = NSZeroRect;
imageRect.size = [gHoverMouseOverImage size]; 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) { switch(self.hoverState) {
case kHoverStateMouseOver: case kHoverStateMouseOver:
[gHoverMouseOverImage drawInRect:imageRect [gHoverMouseOverImage drawInRect:destRect
fromRect:imageRect fromRect:imageRect
operation:NSCompositeSourceOver operation:NSCompositeSourceOver
fraction:1.0]; fraction:1.0];
break; break;
case kHoverStateMouseDown: case kHoverStateMouseDown:
[gHoverMouseDownImage drawInRect:imageRect [gHoverMouseDownImage drawInRect:destRect
fromRect:imageRect fromRect:imageRect
operation:NSCompositeSourceOver operation:NSCompositeSourceOver
fraction:1.0]; fraction:1.0];
...@@ -164,12 +171,12 @@ NSString* const kFadeOutValueKeyPath = @"fadeOutValue"; ...@@ -164,12 +171,12 @@ NSString* const kFadeOutValueKeyPath = @"fadeOutValue";
} else { } else {
previousImage = gHoverMouseDownImage; previousImage = gHoverMouseDownImage;
} }
[previousImage drawInRect:imageRect [previousImage drawInRect:destRect
fromRect:imageRect fromRect:imageRect
operation:NSCompositeSourceOver operation:NSCompositeSourceOver
fraction:1.0 - value]; fraction:1.0 - value];
} }
[gHoverNoneImage drawInRect:imageRect [gHoverNoneImage drawInRect:destRect
fromRect:imageRect fromRect:imageRect
operation:NSCompositeSourceOver operation:NSCompositeSourceOver
fraction:value]; fraction:value];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment