mac: New asset for the tabstrip border, tweak drawing.

chrome/browser/ui/cocoa/tabs/tab_view.mm

 // Copyright (c) 2012 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/tabs/tab_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
 @interface NSWindow (LionAPI)
 - (CGFloat)backingScaleFactor;
 @end
 #endif
 
-namespace {
-
 const int kMaskHeight = 29;  // Height of the mask bitmap.
 const int kFillHeight = 25;  // Height of the "mask on" part of the mask bitmap.
 
 
 // Constants for inset and control points for tab shape.
 const CGFloat kInsetMultiplier = 2.0/3.0;
 const CGFloat kControlPoint1Multiplier = 1.0/3.0;
 const CGFloat kControlPoint2Multiplier = 3.0/8.0;
 
 // The amount of time in seconds during which each type of glow increases, holds
 // steady, and decreases, respectively.
 const NSTimeInterval kHoverShowDuration = 0.2;
 const NSTimeInterval kHoverHoldDuration = 0.02;
 const NSTimeInterval kHoverHideDuration = 0.4;
 const NSTimeInterval kAlertShowDuration = 0.4;
 const NSTimeInterval kAlertHoldDuration = 0.4;
 const NSTimeInterval kAlertHideDuration = 0.4;
 
 // The default time interval in seconds between glow updates (when
 // increasing/decreasing).
 const NSTimeInterval kGlowUpdateInterval = 0.025;
 
 // This is used to judge whether the mouse has moved during rapid closure; if it
 // has moved less than the threshold, we want to close the tab.
 const CGFloat kRapidCloseDist = 2.5;
 
-}  // namespace
-
 @interface TabView(Private)
 
 - (void)resetLastGlowUpdateTime;
 - (NSTimeInterval)timeElapsedSinceLastGlowUpdate;
 - (void)adjustGlowValue;
 - (CGImageRef)tabClippingMask;
 
 @end  // TabView(Private)
 
 @implementation TabView
@@ skipping 253 matching lines @@
       static_cast<ThemeService*>([[self window] themeProvider]);
   [context setPatternPhase:[[self window] themePatternPhase]];
 
 
   CGImageRef mask([self tabClippingMask]);
   CGRect maskBounds = CGRectMake(0, 0, maskCacheWidth_, kMaskHeight);
   CGContextClipToMask(cgContext, maskBounds, mask);
 
   bool selected = [self state];
 
+  // Background tabs should not paint over the tab strip separator, which is
+  // two pixels high in both lodpi and hidpi.
+  if (!selected && dirtyRect.origin.y < 1)
+    dirtyRect.origin.y = 2 * [self cr_lineWidth];
+
   bool usingDefaultTheme = themeProvider && themeProvider->UsingDefaultTheme();
   NSColor* backgroundImageColor = [self backgroundColorForSelected:selected];
 
   // Don't draw the window/tab bar background when selected, since the tab
   // background overlay drawn over it (see below) will be fully opaque.
   if (!selected) {
     [backgroundImageColor set];
     // Themes can have partially transparent images. NSRectFill() is measurably
     // faster though, so call it for the known-safe default theme.
     if (usingDefaultTheme)
@@ skipping 58 matching lines @@
                      options:NSGradientDrawsBeforeStartingLocation];
       }
     }
 
     CGContextEndTransparencyLayer(cgContext);
   }
 }
 
 // Draws the tab outline.
 - (void)drawStroke:(NSRect)dirtyRect {
+  BOOL focused = [[self window] isKeyWindow] || [[self window] isMainWindow];
+  CGFloat alpha = focused ? 1.0 : tabs::kImageNoFocusAlpha;
+
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   float height =
       [rb.GetNativeImageNamed(IDR_TAB_ACTIVE_LEFT).ToNSImage() size].height;
   if ([controller_ active]) {
     NSDrawThreePartImage(NSMakeRect(0, 0, NSWidth([self bounds]), height),
         rb.GetNativeImageNamed(IDR_TAB_ACTIVE_LEFT).ToNSImage(),
         rb.GetNativeImageNamed(IDR_TAB_ACTIVE_CENTER).ToNSImage(),
         rb.GetNativeImageNamed(IDR_TAB_ACTIVE_RIGHT).ToNSImage(),
         /*vertical=*/NO,
         NSCompositeSourceOver,
-        1.0,
+        alpha,
         /*flipped=*/NO);
   } else {
     NSDrawThreePartImage(NSMakeRect(0, 0, NSWidth([self bounds]), height),
         rb.GetNativeImageNamed(IDR_TAB_INACTIVE_LEFT).ToNSImage(),
         rb.GetNativeImageNamed(IDR_TAB_INACTIVE_CENTER).ToNSImage(),
         rb.GetNativeImageNamed(IDR_TAB_INACTIVE_RIGHT).ToNSImage(),
         /*vertical=*/NO,
         NSCompositeSourceOver,
-        1.0,
+        alpha,
         /*flipped=*/NO);
   }
 }
 
 - (void)drawRect:(NSRect)dirtyRect {
   // Text, close button, and image are drawn by subviews.
   [self drawFill:dirtyRect];
   [self drawStroke:dirtyRect];
 }
 
@@ skipping 254 matching lines @@
   CGFloat middleWidth = tabWidth - leftWidth - rightWidth;
   NSRect middleRect = NSMakeRect(leftWidth, 0, middleWidth, kFillHeight);
   [[NSColor whiteColor] setFill];
   NSRectFill(middleRect);
 
   maskCache_.reset(CGBitmapContextCreateImage(maskContext));
   return maskCache_;
 }
 
 @end  // @implementation TabView(Private)