mac: UI tweaks to tab overview mode

chrome/browser/ui/cocoa/tabpose_window.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/tabpose_window.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <algorithm>
 
@@ skipping 19 matching lines @@
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image.h"
 #include "ui/gfx/scoped_cg_context_state_mac.h"
 
-const int kTopGradientHeight  = 15;
+const int kBottomGradientHeight = 50;

[viettrungluu, 2011/03/08 01:33:40]

You really should have some comment about what the gradients are and what the
constants mean. Otherwise, you might as well call these things
|kMagicConstantNumberN|, N = 1, 2, ....

[viettrungluu, 2011/03/08 01:33:40]

Why not a CGFloat?

[Nico, 2011/03/08 01:47:02]

Done. (I maintain that a variable name is a valid medium for information
transport.)

+
+const CGFloat kTopGray = 0.77;
+const CGFloat kCentralGray = 0.6;
+const CGFloat kBottomGray = 0.5;
 
 NSString* const kAnimationIdKey = @"AnimationId";
 NSString* const kAnimationIdFadeIn = @"FadeIn";
 NSString* const kAnimationIdFadeOut = @"FadeOut";
 
 const CGFloat kDefaultAnimationDuration = 0.25;  // In seconds.
 const CGFloat kSlomoFactor = 4;
 const CGFloat kObserverChangeAnimationDuration = 0.25;  // In seconds.
 const CGFloat kSelectionInset = 5;
 
 // CAGradientLayer is 10.6-only -- roll our own.
-@interface DarkGradientLayer : CALayer
+@interface GrayGradientLayer : CALayer {
+  CGFloat startGray_;

[viettrungluu, 2011/03/08 01:33:40]

@private?

[Nico, 2011/03/08 01:47:02]

Done.

+  CGFloat endGray_;
+}
+- (id)initWithStartGray:(CGFloat)startGray endGray:(CGFloat)endGray;
 - (void)drawInContext:(CGContextRef)context;
 @end
 
-@implementation DarkGradientLayer
+@implementation GrayGradientLayer
+- (id)initWithStartGray:(CGFloat)startGray endGray:(CGFloat)endGray {
+  if ((self = [super init])) {
+    startGray_ = startGray;
+    endGray_ = endGray;
+  }
+  return self;
+}
+
 - (void)drawInContext:(CGContextRef)context {
   base::mac::ScopedCFTypeRef<CGColorSpaceRef> grayColorSpace(
       CGColorSpaceCreateWithName(kCGColorSpaceGenericGray));
-  CGFloat grays[] = { 0.277, 1.0, 0.39, 1.0 };
+  CGFloat grays[] = { startGray_, 1.0, endGray_, 1.0 };
   CGFloat locations[] = { 0, 1 };
   base::mac::ScopedCFTypeRef<CGGradientRef> gradient(
       CGGradientCreateWithColorComponents(
           grayColorSpace.get(), grays, locations, arraysize(locations)));
-  CGPoint topLeft = CGPointMake(0.0, kTopGradientHeight);
+  CGPoint topLeft = CGPointMake(0.0, self.bounds.size.height);

[viettrungluu, 2011/03/08 01:33:40]

NSHeight()?

[viettrungluu, 2011/03/08 01:44:58]

Errr, never mind on that.

[Nico, 2011/03/08 01:47:02]

NSHeight still doesn't work with CGRects

   CGContextDrawLinearGradient(context, gradient.get(), topLeft, CGPointZero, 0);
 }
 @end
 
 namespace tabpose {
 class ThumbnailLoader;
 }
 
 // A CALayer that draws a thumbnail for a TabContents object. The layer tries
 // to draw the TabContents's backing store directly if possible, and requests
@@ skipping 1034 matching lines @@
 }
 
 - (void)setUpLayersInSlomo:(BOOL)slomo {
   // Root layer -- covers whole window.
   rootLayer_ = [CALayer layer];
 
   // In a block so that the layers don't fade in.
   {
     ScopedCAActionDisabler disabler;
     // Background layer -- the visible part of the window.
-    gray_.reset(CGColorCreateGenericGray(0.39, 1.0));
+    gray_.reset(CGColorCreateGenericGray(kCentralGray, 1.0));
     bgLayer_ = [CALayer layer];
     bgLayer_.backgroundColor = gray_;
     bgLayer_.frame = NSRectToCGRect(containingRect_);
     bgLayer_.masksToBounds = YES;
     [rootLayer_ addSublayer:bgLayer_];
 
     // Selection highlight layer.
     darkBlue_.reset(CGColorCreateGenericRGB(0.25, 0.34, 0.86, 1.0));
     selectionHighlight_ = [CALayer layer];
     selectionHighlight_.backgroundColor = darkBlue_;
     selectionHighlight_.cornerRadius = 5.0;
     selectionHighlight_.zPosition = -1;  // Behind other layers.
     selectionHighlight_.hidden = YES;
     [bgLayer_ addSublayer:selectionHighlight_];
 
-    // Top gradient.
-    CALayer* gradientLayer = [DarkGradientLayer layer];
+    // Bottom gradient.
+    CALayer* gradientLayer = [[[GrayGradientLayer alloc]
+        initWithStartGray:kCentralGray endGray:kBottomGray] autorelease];
     gradientLayer.frame = CGRectMake(
         0,
-        NSHeight(containingRect_) - kTopGradientHeight,
+        0,
         NSWidth(containingRect_),
-        kTopGradientHeight);
+        kBottomGradientHeight);
     [gradientLayer setNeedsDisplay];  // Draw once.
     [bgLayer_ addSublayer:gradientLayer];
   }
+  // Top gradient (fades in).
+  CGFloat toolbarHeight = NSHeight([self frame]) - NSHeight(containingRect_);
+  topGradient_ = [[[GrayGradientLayer alloc]
+      initWithStartGray:kTopGray endGray:kCentralGray] autorelease];
+  topGradient_.frame = CGRectMake(
+      0,
+      NSHeight([self frame]) - toolbarHeight,
+      NSWidth(containingRect_),
+      toolbarHeight);
+  [topGradient_ setNeedsDisplay];  // Draw once.
+  [rootLayer_ addSublayer:topGradient_];
+  NSTimeInterval interval =
+      kDefaultAnimationDuration * (slomo ? kSlomoFactor : 1);
+  AnimateCALayerOpacityFromTo(topGradient_, 0, 1, interval);
 
   // Layers for the tab thumbnails.
   tileSet_->Build(tabStripModel_);
   tileSet_->Layout(containingRect_);
   allThumbnailLayers_.reset(
       [[NSMutableArray alloc] initWithCapacity:tabStripModel_->count()]);
   allFaviconLayers_.reset(
       [[NSMutableArray alloc] initWithCapacity:tabStripModel_->count()]);
   allTitleLayers_.reset(
       [[NSMutableArray alloc] initWithCapacity:tabStripModel_->count()]);
@@ skipping 236 matching lines @@
             forKeyPath:@"transform.scale"];
   titleLayer.opacity = 0;
 }
 
 - (void)fadeAwayInSlomo:(BOOL)slomo {
   if (state_ == tabpose::kFadingOut)
     return;
 
   state_ = tabpose::kFadingOut;
   [self setAcceptsMouseMovedEvents:NO];
 

[viettrungluu, 2011/03/08 01:33:40]

wha?

+
   // Select chosen tab.
   if (tileSet_->selected_index() < tabStripModel_->count()) {
     tabStripModel_->SelectTabContentsAt(tileSet_->selected_index(),
                                         /*user_gesture=*/true);
   } else {
     DCHECK_EQ(tileSet_->selected_index(), 0);
   }
 
   {
     ScopedCAActionDisabler disableCAActions;
 
     // Move the selected layer on top of all other layers.
     [self selectedLayer].zPosition = 1;
 
     selectionHighlight_.hidden = YES;
     // Running animations with shadows is slow, so turn shadows off before
     // running the exit animation.
     for (CALayer* layer in allThumbnailLayers_.get())
       layer.shadowOpacity = 0.0;
 
     [self updateClosebuttonLayersVisibility];
   }
 
   // Animate layers out, all in one transaction.
   CGFloat duration =
       1.3 * kDefaultAnimationDuration * (slomo ? kSlomoFactor : 1);
   ScopedCAActionSetDuration durationSetter(duration);
   for (int i = 0; i < tabStripModel_->count(); ++i)
     [self fadeAwayTileAtIndex:i];
+  AnimateCALayerOpacityFromTo(topGradient_, 1, 0, duration);
 }
 
 - (void)animationDidStop:(CAAnimation*)animation finished:(BOOL)finished {
   NSString* animationId = [animation valueForKey:kAnimationIdKey];
   if ([animationId isEqualToString:kAnimationIdFadeIn]) {
     if (finished && state_ == tabpose::kFadingIn) {
       // If the user clicks while the fade in animation is still running,
       // |state_| is already kFadingOut. In that case, don't do anything.
       state_ = tabpose::kFadedIn;
 
@@ skipping 215 matching lines @@
   tile.set_tab_contents(contents->tab_contents());
   ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index];
   [thumbLayer setTabContents:contents->tab_contents()];
 }
 
 - (void)tabStripModelDeleted {
   [self close];
 }
 
 @end