diff options
| -rw-r--r-- | chrome/app/nibs/BookmarkBubble.xib | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/info_bubble_window.h | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/info_bubble_window.mm | 85 |
3 files changed, 87 insertions, 8 deletions
diff --git a/chrome/app/nibs/BookmarkBubble.xib b/chrome/app/nibs/BookmarkBubble.xib index e3f6c3c..abc2b5d 100644 --- a/chrome/app/nibs/BookmarkBubble.xib +++ b/chrome/app/nibs/BookmarkBubble.xib @@ -12,7 +12,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="51"/> + <integer value="50"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -778,7 +778,7 @@ <string>{{241, 633}, {374, 145}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{241, 633}, {374, 145}}</string> - <boolean value="YES"/> + <boolean value="NO"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/chrome/browser/cocoa/info_bubble_window.h b/chrome/browser/cocoa/info_bubble_window.h index bd549d1..eea956b 100644 --- a/chrome/browser/cocoa/info_bubble_window.h +++ b/chrome/browser/cocoa/info_bubble_window.h @@ -6,5 +6,9 @@ // A rounded window with an arrow used for example when you click on the STAR // button or that pops up within our first-run UI. -@interface InfoBubbleWindow : NSWindow +@interface InfoBubbleWindow : NSWindow { + @private + // Is self in the process of closing. + BOOL closing_; +} @end diff --git a/chrome/browser/cocoa/info_bubble_window.mm b/chrome/browser/cocoa/info_bubble_window.mm index 9941c62..9cfb432 100644 --- a/chrome/browser/cocoa/info_bubble_window.mm +++ b/chrome/browser/cocoa/info_bubble_window.mm @@ -4,6 +4,15 @@ #import "chrome/browser/cocoa/info_bubble_window.h" +#include "base/logging.h" +#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" + +namespace { +const CGFloat kOrderInSlideOffset = 10; +const NSTimeInterval kOrderInAnimationDuration = 0.3; +const NSTimeInterval kOrderOutAnimationDuration = 0.15; +} + @implementation InfoBubbleWindow - (id)initWithContentRect:(NSRect)contentRect @@ -16,21 +25,87 @@ defer:flag])) { [self setBackgroundColor:[NSColor clearColor]]; [self setExcludedFromWindowsMenu:YES]; - [self setAlphaValue:1.0]; [self setOpaque:NO]; [self setHasShadow:YES]; + + // Start invisible. Will be made visible when ordered front. + [self setAlphaValue:0.0]; + + // Set up alphaValue animation so that self is delegate for the animation. + // Setting up the delegate is required so that the + // animationDidStop:finished: callback can be handled. + // Notice that only the alphaValue Animation is replaced in case + // superclasses set up animations. + CAAnimation* alphaAnimation = [CABasicAnimation animation]; + [alphaAnimation setDelegate:self]; + NSMutableDictionary* animations = + [NSMutableDictionary dictionaryWithDictionary:[self animations]]; + [animations setObject:alphaAnimation forKey:@"alphaValue"]; } return self; } // According to // http://www.cocoabuilder.com/archive/message/cocoa/2006/6/19/165953, -// NSBorderlessWindowMask windows cannot become key or main. In our -// case, however, we don't want all of that behavior. As an example, -// our bubble could have buttons. - +// NSBorderlessWindowMask windows cannot become key or main. In this +// case, this is not a desired behavior. As an example, the bubble could have +// buttons. - (BOOL)canBecomeKeyWindow { return YES; } +// Adds animation for info bubbles being ordered to the front and ordered out. +- (void)orderWindow:(NSWindowOrderingMode)orderingMode + relativeTo:(NSInteger)otherWindowNumber { + // According to the documentation '0' is the otherWindowNumber when the window + // is ordered front. + if (orderingMode == NSWindowAbove && otherWindowNumber == 0) { + // Order self appropriately assuming that its alpha is zero as set up + // in the designated initializer. + [super orderWindow:orderingMode relativeTo:otherWindowNumber]; + + // Set up frame so it can be adjust down by a few pixels. + NSRect frame = [self frame]; + NSPoint newOrigin = frame.origin; + newOrigin.y += kOrderInSlideOffset; + [self setFrameOrigin:newOrigin]; + + // Apply animations to show and move self. + [NSAnimationContext beginGrouping]; + [[NSAnimationContext currentContext] + gtm_setDuration:kOrderInAnimationDuration]; + [[self animator] setAlphaValue:1.0]; + [[self animator] setFrame:frame display:YES]; + [NSAnimationContext endGrouping]; + } else if (orderingMode == NSWindowOut) { + // Flag self as closing to block events while animation is occurring. + closing_ = YES; + + // Apply animations to hide self. + [NSAnimationContext beginGrouping]; + [[NSAnimationContext currentContext] + gtm_setDuration:kOrderOutAnimationDuration]; + [[self animator] setAlphaValue:0.0]; + [NSAnimationContext endGrouping]; + } else { + [super orderWindow:orderingMode relativeTo:otherWindowNumber]; + } +} + +// If the window is currently animating a close, block all UI events to the +// window. +- (void)sendEvent:(NSEvent*)theEvent { + if (!closing_) { + [super sendEvent:theEvent]; + } +} + +// Callback for the alpha animation set up in designated initializer. +- (void)animationDidStop:(CAAnimation*)anim finished:(BOOL)flag { + // When alpha reaches zero, close self. + if ([self alphaValue] == 0.0) { + [self close]; + } +} + @end |