Mac: Highlight selected tile in tabpose.

chrome/browser/cocoa/tabpose_window.mm

 // Copyright (c) 2010 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/cocoa/tabpose_window.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
@@ skipping 352 matching lines @@
     [self setBackgroundColor:[NSColor clearColor]];
     [self setUpLayers:rect slomo:slomo];
     [self setAcceptsMouseMovedEvents:YES];
     [parent addChildWindow:self ordered:NSWindowAbove];
     [self makeKeyAndOrderFront:self];
   }
   return self;
 }
 
 - (CALayer*)selectedLayer {
-  return [allLayers_ objectAtIndex:tileSet_->selected_index()];
+  return [allThumbnailLayers_ objectAtIndex:tileSet_->selected_index()];
 }
 
 - (void)selectTileAtIndex:(int)newIndex {
-  // TODO(thakis): Have a nicer indicator for the current selection
-  // (a blue outline, probably).
-  int oldIndex = tileSet_->selected_index();
-  CALayer* oldSelectedLayer = [allLayers_ objectAtIndex:oldIndex];
-  oldSelectedLayer.backgroundColor = CGColorGetConstantColor(kCGColorBlack);
-  CALayer* newSelectedLayer = [allLayers_ objectAtIndex:newIndex];
-  newSelectedLayer.backgroundColor = CGColorGetConstantColor(kCGColorWhite);
+  ScopedCAActionDisabler disabler;
+  const tabpose::Tile& tile = tileSet_->tile_at(newIndex);
+  selectionHighlight_.frame =
+      NSRectToCGRect(NSInsetRect(tile.thumb_rect(), -6, -6));
 
   tileSet_->set_selected_index(newIndex);
 }
 
 - (void)setUpLayers:(NSRect)bgLayerRect slomo:(BOOL)slomo {
   // Root layer -- covers whole window.
   rootLayer_ = [CALayer layer];
   [[self contentView] setLayer:rootLayer_];
   [[self contentView] setWantsLayer:YES];
 
   // Background layer -- the visible part of the window.
   gray_.reset(CGColorCreateGenericGray(0.39, 1.0));
   bgLayer_ = [CALayer layer];
   bgLayer_.backgroundColor = gray_;
   bgLayer_.frame = NSRectToCGRect(bgLayerRect);
   bgLayer_.masksToBounds = YES;
   [rootLayer_ addSublayer:bgLayer_];
 
+  // Selection highlight layer.
+  darkBlue_.reset(CGColorCreateGenericRGB(0.25, 0.34, 0.86, 1.0));

[viettrungluu, 2010/08/10 00:42:33]

Out of which orifice did you get these numbers? :P

+  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];
   gradientLayer.frame = CGRectMake(
       0,
       NSHeight(bgLayerRect) - kTopGradientHeight,
       NSWidth(bgLayerRect),
       kTopGradientHeight);
   [gradientLayer setNeedsDisplay];  // Draw once.
   [bgLayer_ addSublayer:gradientLayer];
 
   // Layers for the tab thumbnails.
   tileSet_->Build(tabStripModel_);
   tileSet_->Layout(bgLayerRect);
 
-  allLayers_.reset(
+  allThumbnailLayers_.reset(
       [[NSMutableArray alloc] initWithCapacity:tabStripModel_->count()]);
   for (int i = 0; i < tabStripModel_->count(); ++i) {
     CALayer* layer = [CALayer layer];
 
     // Background color as placeholder for now.
-    layer.backgroundColor = CGColorGetConstantColor(kCGColorBlack);
+    layer.backgroundColor = CGColorGetConstantColor(kCGColorWhite);
 
     AnimateCALayerFrameFromTo(
         layer,
         tileSet_->tile_at(i).GetStartRectRelativeTo(tileSet_->selected_tile()),
         tileSet_->tile_at(i).thumb_rect(),
         kDefaultAnimationDuration * (slomo ? kSlomoFactor : 1),
         i == tileSet_->selected_index() ? self : nil);
 
     // Add a delegate to one of the animations to get a notification once the
     // animations are done.
     if (i == tileSet_->selected_index()) {
       CAAnimation* animation = [layer animationForKey:@"bounds"];
       DCHECK(animation);
       [animation setValue:kAnimationIdFadeIn forKey:kAnimationIdKey];
     }
 
     layer.shadowRadius = 10;
     layer.shadowOffset = CGSizeMake(0, -10);
 
     [bgLayer_ addSublayer:layer];
-    [allLayers_ addObject:layer];
+    [allThumbnailLayers_ addObject:layer];
   }
   [self selectTileAtIndex:tileSet_->selected_index()];
 }
 
 - (BOOL)canBecomeKeyWindow {
  return YES;
 }
 
 - (void)keyDown:(NSEvent*)event {
   // Overridden to prevent beeps.
@@ skipping 19 matching lines @@
       tileSet_->ResetSelectedIndex();
       [self fadeAway:([event modifierFlags] & NSShiftKeyMask) != 0];
       break;
     // TODO(thakis): Support moving the selection via arrow keys.
   }
 }
 
 - (void)mouseMoved:(NSEvent*)event {
   int newIndex = -1;
   CGPoint p = NSPointToCGPoint([event locationInWindow]);
-  for (NSUInteger i = 0; i < [allLayers_ count]; ++i) {
-    CALayer* layer = [allLayers_ objectAtIndex:i];
+  for (NSUInteger i = 0; i < [allThumbnailLayers_ count]; ++i) {
+    CALayer* layer = [allThumbnailLayers_ objectAtIndex:i];
     CGPoint lp = [layer convertPoint:p fromLayer:rootLayer_];
     if ([static_cast<CALayer*>([layer presentationLayer]) containsPoint:lp])
       newIndex = i;
   }
   if (newIndex >= 0)
     [self selectTileAtIndex:newIndex];
 }
 
 - (void)mouseDown:(NSEvent*)event {
   [self fadeAway:([event modifierFlags] & NSShiftKeyMask) != 0];
@@ skipping 29 matching lines @@
   // Select chosen tab.
   tabStripModel_->SelectTabContentsAt(tileSet_->selected_index(),
                                       /*user_gesture=*/true);
 
   {
     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 allLayers_.get())
+    for (CALayer* layer in allThumbnailLayers_.get())
       layer.shadowOpacity = 0.0;
   }
 
   // Animate layers out, all in one transaction.
   CGFloat duration = kDefaultAnimationDuration * (slomo ? kSlomoFactor : 1);
   ScopedCAActionSetDuration durationSetter(duration);
-  for (NSUInteger i = 0; i < [allLayers_ count]; ++i) {
-    CALayer* layer = [allLayers_ objectAtIndex:i];
+  for (NSUInteger i = 0; i < [allThumbnailLayers_ count]; ++i) {
+    CALayer* layer = [allThumbnailLayers_ objectAtIndex:i];
     // |start_thumb_rect_| was relative to |initial_index_|, now this needs to
     // be relative to |selectedIndex_| (whose start rect was relative to
     // |initial_index_| too)
     CGRect newFrame = NSRectToCGRect(
         tileSet_->tile_at(i).GetStartRectRelativeTo(tileSet_->selected_tile()));
 
     // Add a delegate to one of the implicit animations to get a notification
     // once the animations are done.
     if (static_cast<int>(i) == tileSet_->selected_index()) {
       CAAnimation* animation = [CAAnimation animation];
       animation.delegate = self;
       [animation setValue:kAnimationIdFadeOut forKey:kAnimationIdKey];
       [layer addAnimation:animation forKey:@"frame"];
     }
 
     layer.frame = newFrame;
   }
 }
 
 - (void)animationDidStop:(CAAnimation*)animation finished:(BOOL)finished {
   NSString* animationId = [animation valueForKey:kAnimationIdKey];
   if ([animationId isEqualToString:kAnimationIdFadeIn]) {
     if (finished) {
       // If the user clicks while the fade in animation is still running,
       // |state_| is already kFadingOut. In that case, don't do anything.
       DCHECK_EQ(tabpose::kFadingIn, state_);
       state_ = tabpose::kFadedIn;
 
+      selectionHighlight_.hidden = NO;
+
       // Running animations with shadows is slow, so turn shadows on only after
       // the animation is done.
       ScopedCAActionDisabler disableCAActions;
-      for (CALayer* layer in allLayers_.get())
+      for (CALayer* layer in allThumbnailLayers_.get())
         layer.shadowOpacity = 0.5;
     }
   } else if ([animationId isEqualToString:kAnimationIdFadeOut]) {
     DCHECK_EQ(tabpose::kFadingOut, state_);
     [self close];
   }
 }
 
 @end