Pixel perfection on tabstrip for non-Aero frame. This gets both ends of the ...

chrome/browser/views/frame/opaque_non_client_view.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/views/frame/opaque_non_client_view.h"
 
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/tab_contents.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
@@ skipping 357 matching lines @@
 static const int kOTRZoomedLeftOffset = 6;
 // The distance between the top edge of the client area and the OTR avatar icon
 // when the window is maximized.
 static const int kOTRZoomedTopSpacing = 2;
 // The distance between the bottom of the OTR avatar icon and the bottom of the
 // tabstrip.
 static const int kOTRBottomSpacing = 2;
 // The number of pixels to crop off the top of the OTR image when the window is
 // maximized.
 static const int kOTRZoomedTopCrop = 4;
+// Horizontal distance between the right edge of the OTR avatar icon and the
+// left edge of the tabstrip.
+static const int kOTRTabStripSpacing = 2;
+// Horizontal distance between the right edge of the new tab icon and the left
+// edge of the window minimize icon when the window is restored.
+static const int kNewTabIconMinimizeSpacing = 5;
 // Horizontal distance between the right edge of the new tab icon and the left
 // edge of the window minimize icon when the window is maximized.
-static const int kNewTabIconWindowControlsSpacing = 10;
+static const int kNewTabIconMinimizeZoomedSpacing = 16;
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueNonClientView, public:
 
 OpaqueNonClientView::OpaqueNonClientView(OpaqueFrame* frame,
                                          BrowserView* browser_view)
     : NonClientView(),
       minimize_button_(new views::Button),
       maximize_button_(new views::Button),
       restore_button_(new views::Button),
@@ skipping 83 matching lines @@
   if (browser_view_->ShouldShowWindowTitle())
     InitAppWindowResources();
 }
 
 OpaqueNonClientView::~OpaqueNonClientView() {
 }
 
 gfx::Rect OpaqueNonClientView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) {
   int top_height = CalculateNonClientTopHeight();
-  int horizontal_border = frame_->IsMaximized() ?
-      kWindowHorizontalBorderZoomedSize : kWindowHorizontalBorderSize;
+  int horizontal_border = HorizontalBorderSize();
   int window_x = std::max(0, client_bounds.x() - horizontal_border);
   int window_y = std::max(0, client_bounds.y() - top_height);
   int window_w = client_bounds.width() + (2 * horizontal_border);
   int window_h =
       client_bounds.height() + top_height + kWindowVerticalBorderBottomSize;
   return gfx::Rect(window_x, window_y, window_w, window_h);
 }
 
 gfx::Rect OpaqueNonClientView::GetBoundsForTabStrip(TabStrip* tabstrip) {
-  int tabstrip_x = otr_avatar_bounds_.right();
-  int tabstrip_width = minimize_button_->x() - tabstrip_x;
-  if (frame_->IsMaximized())
-    tabstrip_width -= kNewTabIconWindowControlsSpacing;
-  return gfx::Rect(tabstrip_x, 0, std::max(0, tabstrip_width),
-                   tabstrip->GetPreferredHeight());
+  int tabstrip_x = browser_view_->ShouldShowOffTheRecordAvatar() ?
+      (otr_avatar_bounds_.right() + kOTRTabStripSpacing) :
+      HorizontalBorderSize();
+  int tabstrip_width = minimize_button_->x() - tabstrip_x -
+      (frame_->IsMaximized() ?
+      kNewTabIconMinimizeZoomedSpacing : kNewTabIconMinimizeSpacing);
+  return gfx::Rect(tabstrip_x, CalculateNonClientTopHeight(),
+                   std::max(0, tabstrip_width), tabstrip->GetPreferredHeight());
 }
 
 void OpaqueNonClientView::UpdateWindowIcon() {
   if (window_icon_)
     window_icon_->Update();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueNonClientView, TabIconView::TabContentsProvider implementation:
 
@@ skipping 23 matching lines @@
     frame_->ExecuteSystemMenuCommand(SC_CLOSE);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueNonClientView, views::NonClientView implementation:
 
 gfx::Rect OpaqueNonClientView::CalculateClientAreaBounds(int width,
                                                          int height) const {
   int top_margin = CalculateNonClientTopHeight();
-  int horizontal_border = frame_->IsMaximized() ?
-      kWindowHorizontalBorderZoomedSize : kWindowHorizontalBorderSize;
+  int horizontal_border = HorizontalBorderSize();
   return gfx::Rect(horizontal_border, top_margin,
       std::max(0, width - (2 * horizontal_border)),
       std::max(0, height - top_margin - kWindowVerticalBorderBottomSize));
 }
 
 gfx::Size OpaqueNonClientView::CalculateWindowSizeForClientSize(
     int width,
     int height) const {
-  int horizontal_border = frame_->IsMaximized() ?
-      kWindowHorizontalBorderZoomedSize : kWindowHorizontalBorderSize;
-  return gfx::Size(width + (2 * horizontal_border),
+  return gfx::Size(width + (2 * HorizontalBorderSize()),
       height + CalculateNonClientTopHeight() + kWindowVerticalBorderBottomSize);
 }
 
 CPoint OpaqueNonClientView::GetSystemMenuPoint() const {
   CPoint system_menu_point(icon_bounds_.x(), icon_bounds_.bottom());
   MapWindowPoints(frame_->GetHWND(), HWND_DESKTOP, &system_menu_point, 1);
   return system_menu_point;
 }
 
 int OpaqueNonClientView::NonClientHitTest(const gfx::Point& point) {
@@ skipping 12 matching lines @@
   if (maximize_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(
       point))
     return HTMAXBUTTON;
   if (minimize_button_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(
       point))
     return HTMINBUTTON;
   if (window_icon_ &&
       window_icon_->GetBounds(APPLY_MIRRORING_TRANSFORMATION).Contains(point))
     return HTSYSMENU;
 
-  int horizontal_border = frame_->IsMaximized() ?
-      kWindowHorizontalBorderZoomedSize : kWindowHorizontalBorderSize;
-  int window_component = GetHTComponentForFrame(point, horizontal_border,
+  int window_component = GetHTComponentForFrame(point, HorizontalBorderSize(),
       kResizeAreaCornerSize, kWindowVerticalBorderTopSize,
       frame_->window_delegate()->CanResize());
   // Fall back to the caption if no other component matches.
   if ((window_component == HTNOWHERE) && bounds().Contains(point))
     window_component = HTCAPTION;
   return window_component;
 }
 
 void OpaqueNonClientView::GetWindowMask(const gfx::Size& size,
                                         gfx::Path* window_mask) {
@@ skipping 56 matching lines @@
 
 void OpaqueNonClientView::Layout() {
   LayoutWindowControls();
   LayoutDistributorLogo();
   LayoutTitleBar();
   LayoutOTRAvatar();
   LayoutClientView();
 }
 
 gfx::Size OpaqueNonClientView::GetPreferredSize() {
-  int horizontal_border = frame_->IsMaximized() ?
-      kWindowHorizontalBorderZoomedSize : kWindowHorizontalBorderSize;
   gfx::Size prefsize(frame_->client_view()->GetPreferredSize());
-  prefsize.Enlarge(2 * horizontal_border,
+  prefsize.Enlarge(2 * HorizontalBorderSize(),
       CalculateNonClientTopHeight() + kWindowVerticalBorderBottomSize);
   return prefsize;
 }
 
 views::View* OpaqueNonClientView::GetViewForPoint(const gfx::Point& point,
                                                   bool can_create_floating) {
   // We override this function because the ClientView can overlap the non -
   // client view, making it impossible to click on the window controls. We need
   // to ensure the window controls are checked _first_.
   views::View* views[] = { close_button_, restore_button_, maximize_button_,
@@ skipping 46 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueNonClientView, private:
 
 int OpaqueNonClientView::CalculateNonClientTopHeight() const {
   if (frame_->window_delegate()->ShouldShowWindowTitle())
     return kTitleTopOffset + title_font_.height() + kTitleBottomSpacing;
   return frame_->IsMaximized() ? kNoTitleZoomedTopSpacing : kNoTitleTopSpacing;
 }
 
+int OpaqueNonClientView::HorizontalBorderSize() const {
+  return frame_->IsMaximized() ?
+      kWindowHorizontalBorderZoomedSize : kWindowHorizontalBorderSize;
+}
+
 void OpaqueNonClientView::PaintFrameBorder(ChromeCanvas* canvas) {
   SkBitmap* top_left_corner =
       resources()->GetPartBitmap(FRAME_TOP_LEFT_CORNER);
   SkBitmap* top_right_corner =
       resources()->GetPartBitmap(FRAME_TOP_RIGHT_CORNER);
   SkBitmap* top_edge = resources()->GetPartBitmap(FRAME_TOP_EDGE);
   SkBitmap* right_edge = resources()->GetPartBitmap(FRAME_RIGHT_EDGE);
   SkBitmap* left_edge = resources()->GetPartBitmap(FRAME_LEFT_EDGE);
   SkBitmap* bottom_left_corner =
       resources()->GetPartBitmap(FRAME_BOTTOM_LEFT_CORNER);
@@ skipping 84 matching lines @@
                        toolbar_bounds.width(), toolbar_center->height());
 
   canvas->DrawBitmapInt(
       *resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_RIGHT),
       toolbar_bounds.right(), toolbar_bounds.y());
 }
 
 void OpaqueNonClientView::PaintOTRAvatar(ChromeCanvas* canvas) {
   if (browser_view_->ShouldShowOffTheRecordAvatar()) {
     int src_y = frame_->IsMaximized() ? kOTRZoomedTopCrop : 0;
-    canvas->DrawBitmapInt(browser_view_->GetOTRAvatarIcon(),
-        0, src_y, otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), 
+    canvas->DrawBitmapInt(browser_view_->GetOTRAvatarIcon(), 0, src_y,
+        otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), 
         MirroredLeftPointForRect(otr_avatar_bounds_), otr_avatar_bounds_.y(),
         otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), false);
   }
 }
 
 void OpaqueNonClientView::PaintClientEdge(ChromeCanvas* canvas) {
   // The toolbar draws a client edge along its own bottom edge when it's
   // visible.  However, it only draws this for the width of the actual client
   // area, leaving a gap at the left and right edges:
   //
@@ skipping 144 matching lines @@
     int title_left =
         icon_right + (d->ShouldShowWindowIcon() ? kWindowIconTitleSpacing : 0);
     int top_offset = frame_->IsMaximized() ?
         kTitleZoomedTopOffset : kTitleTopOffset;
     title_bounds_.SetRect(title_left, top_offset,
         std::max(0, title_right - icon_right), title_font_.height());
   }
 }
 
 void OpaqueNonClientView::LayoutOTRAvatar() {
-  if (!browser_view_->ShouldShowOffTheRecordAvatar()) {
-    otr_avatar_bounds_.SetRect(0, 0, 0, 0);
-    return;
-  }
-
   SkBitmap otr_avatar_icon = browser_view_->GetOTRAvatarIcon();
   int non_client_height = CalculateNonClientTopHeight();
   int otr_bottom = non_client_height + browser_view_->GetTabStripHeight() -
       kOTRBottomSpacing;
   int otr_x, otr_y, otr_height;
   if (frame_->IsMaximized()) {
     otr_x = kOTRZoomedLeftOffset;
     otr_y = non_client_height + kOTRZoomedTopSpacing;
     otr_height = otr_bottom - otr_y;
   } else {
@@ skipping 30 matching lines @@
 }
 
 // static
 void OpaqueNonClientView::InitAppWindowResources() {
   static bool initialized = false;
   if (!initialized) {
     title_font_ = win_util::GetWindowTitleFont();
     initialized = true;
   }
 }