Improved OTR avatar and popup window rendering.

chrome/browser/views/frame/aero_glass_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/aero_glass_non_client_view.h"
 
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/common/gfx/chrome_canvas.h"
@@ skipping 95 matching lines @@
 static const int kTabStripY = 19;
 // How much space on the right is not used for the tab strip (to provide
 // separation between the tabs and the window controls).
 static const int kTabStripRightHorizOffset = 30;
 // A single pixel.
 static const int kPixel = 1;
 // The height of the sizing border.
 static const int kWindowSizingBorderSize = 8;
 // The size (width/height) of the window icon.
 static const int kWindowIconSize = 16;
-// The distance from the left of the window of the OTR avatar icon.
-static const int kOTRAvatarIconMargin = 9;
-// The distance from the right edge of the OTR avatar icon to the left edge of
-// the TabStrip.
-static const int kOTRAvatarIconTabStripSpacing = 6;
-// The distance from the top of the window of the OTR avatar icon when the
-// window is maximized.
-static const int kNoTitleOTRTopSpacing = 23;
-// The distance from the top of the window of the OTR avatar icon when the
-// window is maximized.
-static const int kNoTitleOTRZoomedTopSpacing = 3;
+// In maximized mode, the OTR avatar starts 2 px below the top of the screen, so
+// that it doesn't extend into the "3D edge" portion of the titlebar.
+const int kOTRMaximizedTopSpacing = 2;
+// The OTR avatar ends 2 px above the bottom of the tabstrip (which, given the
+// way the tabstrip draws its bottom edge, will appear like a 1 px gap to the
+// user).
+const int kOTRBottomSpacing = 2;
+// There are 2 px on each side of the OTR avatar (between the frame border and
+// it on the left, and between it and the tabstrip on the right).
+const int kOTRSideSpacing = 2;
 
 ///////////////////////////////////////////////////////////////////////////////
 // AeroGlassNonClientView, public:
 
 AeroGlassNonClientView::AeroGlassNonClientView(AeroGlassFrame* frame,
                                                BrowserView* browser_view)
     : frame_(frame),
       browser_view_(browser_view) {
   InitClass();
 }
 
 AeroGlassNonClientView::~AeroGlassNonClientView() {
 }
 
 gfx::Rect AeroGlassNonClientView::GetBoundsForTabStrip(TabStrip* tabstrip) {
   int tabstrip_x = browser_view_->ShouldShowOffTheRecordAvatar() ?
-      (otr_avatar_bounds_.right() + kOTRAvatarIconTabStripSpacing) :
+      (otr_avatar_bounds_.right() + kOTRSideSpacing) :
       kWindowHorizontalClientEdgeWidth;
   int tabstrip_width = width() - tabstrip_x - kTabStripRightHorizOffset -
     (frame_->IsMaximized() ? frame_->GetMinimizeButtonOffset() : 0);
   int tabstrip_y =
     frame_->IsMaximized() ? (CalculateNonClientTopHeight() - 2) : kTabStripY;
   return gfx::Rect(tabstrip_x, tabstrip_y, std::max(0, tabstrip_width),
                    tabstrip->GetPreferredHeight());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // AeroGlassNonClientView, views::NonClientView implementation:
 
 gfx::Rect AeroGlassNonClientView::CalculateClientAreaBounds(int win_width,
                                                             int win_height) const {
-  if (!browser_view_->IsToolbarVisible()) {
-    // App windows don't have a toolbar.
+  if (!browser_view_->IsTabStripVisible())
     return gfx::Rect(0, 0, width(), height());
-  }
 
   int top_margin = CalculateNonClientTopHeight();
   return gfx::Rect(kWindowHorizontalClientEdgeWidth, top_margin,
       std::max(0, win_width - (2 * kWindowHorizontalClientEdgeWidth)),
       std::max(0, win_height - top_margin - kWindowBottomClientEdgeHeight));
 }
 
 gfx::Size AeroGlassNonClientView::CalculateWindowSizeForClientSize(
     int width,
     int height) const {
@@ skipping 11 matching lines @@
 int AeroGlassNonClientView::NonClientHitTest(const gfx::Point& point) {
   CRect bounds;
   CPoint test_point = point.ToPOINT();
 
   // See if the client view intersects the non-client area (e.g. blank areas
   // of the TabStrip).
   int component = frame_->client_view()->NonClientHitTest(point);
   if (component != HTNOWHERE)
     return component;
 
-  // This check is only done when we have a toolbar, which is the only time
+  // This check is only done when we have a tabstrip, which is the only time
   // that we have a non-standard non-client area.
-  if (browser_view_->IsToolbarVisible()) {
+  if (browser_view_->IsTabStripVisible()) {
     // Because we tell Windows that our client area extends all the way to the
     // top of the browser window, but our BrowserView doesn't actually go up that
     // high, we need to make sure the right hit-test codes are returned for the
     // caption area above the tabs and the top sizing border.
     int client_view_right =
         frame_->client_view()->x() + frame_->client_view()->width();
     if (point.x() >= frame_->client_view()->x() &&
         point.x() < client_view_right) {
       if (point.y() < kWindowSizingBorderSize)
         return HTTOP;
@@ skipping 16 matching lines @@
 }
 
 void AeroGlassNonClientView::ResetWindowControls() {
   // Our window controls are rendered by the system and do not require reset.
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // AeroGlassNonClientView, views::View overrides:
 
 void AeroGlassNonClientView::Paint(ChromeCanvas* canvas) {
+  PaintDistributorLogo(canvas);
+  if (browser_view_->IsTabStripVisible())
+    PaintToolbarBackground(canvas);
   PaintOTRAvatar(canvas);
-  PaintDistributorLogo(canvas);
-  if (browser_view_->IsToolbarVisible()) {
-    PaintToolbarBackground(canvas);
+  if (browser_view_->IsTabStripVisible())
     PaintClientEdge(canvas);
-  }
 }
 
 void AeroGlassNonClientView::Layout() {
   LayoutOTRAvatar();
   LayoutDistributorLogo();
   LayoutClientView();
 }
 
 gfx::Size AeroGlassNonClientView::GetPreferredSize() {
   gfx::Size prefsize = frame_->client_view()->GetPreferredSize();
@@ skipping 16 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // AeroGlassNonClientView, private:
 
 int AeroGlassNonClientView::CalculateNonClientTopHeight() const {
   if (frame_->window_delegate()->ShouldShowWindowTitle())
     return browser_view_->IsToolbarVisible() ? -1 : 0;
   return kNoTitleTopSpacing;
 }
 
 void AeroGlassNonClientView::PaintOTRAvatar(ChromeCanvas* canvas) {
-  if (browser_view_->ShouldShowOffTheRecordAvatar()) {
-    int icon_x = MirroredLeftPointForRect(otr_avatar_bounds_);
-    canvas->DrawBitmapInt(browser_view_->GetOTRAvatarIcon(), icon_x,
-                          otr_avatar_bounds_.y());
-  }
+  if (!browser_view_->ShouldShowOffTheRecordAvatar())
+    return;
+
+  SkBitmap otr_avatar_icon = browser_view_->GetOTRAvatarIcon();
+  canvas->DrawBitmapInt(otr_avatar_icon, 0,
+      (otr_avatar_icon.height() - otr_avatar_bounds_.height()) / 2,
+      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 AeroGlassNonClientView::PaintDistributorLogo(ChromeCanvas* canvas) {
   // The distributor logo is only painted when the frame is not maximized and
   // when we actually have a logo.
   if (!frame_->IsMaximized() && !frame_->IsMinimized() && 
       !distributor_logo_.empty()) {
     canvas->DrawBitmapInt(distributor_logo_, logo_bounds_.x(),
                           logo_bounds_.y());
   }
 }
 
 void AeroGlassNonClientView::PaintToolbarBackground(ChromeCanvas* canvas) {
-  if (browser_view_->IsToolbarVisible() ||
-      browser_view_->IsTabStripVisible()) {
-    SkBitmap* toolbar_left =
-        resources_->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_LEFT);
-    SkBitmap* toolbar_center =
-        resources_->GetPartBitmap(FRAME_CLIENT_EDGE_TOP);
-    SkBitmap* toolbar_right =
-        resources_->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_RIGHT);
+  SkBitmap* toolbar_left =
+      resources_->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_LEFT);
+  SkBitmap* toolbar_center =
+      resources_->GetPartBitmap(FRAME_CLIENT_EDGE_TOP);
+  SkBitmap* toolbar_right =
+      resources_->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_RIGHT);
 
-    gfx::Rect toolbar_bounds = browser_view_->GetToolbarBounds();
-    gfx::Point topleft(toolbar_bounds.x(), toolbar_bounds.y());
-    View::ConvertPointToView(frame_->client_view(), this, &topleft);
-    toolbar_bounds.set_x(topleft.x());
-    toolbar_bounds.set_y(topleft.y());
+  gfx::Rect toolbar_bounds = browser_view_->GetToolbarBounds();
+  gfx::Point topleft(toolbar_bounds.x(), toolbar_bounds.y());
+  View::ConvertPointToView(frame_->client_view(), this, &topleft);
+  toolbar_bounds.set_x(topleft.x());
+  toolbar_bounds.set_y(topleft.y());
 
-    // We use TileImageInt for the left and right caps to clip the rendering
-    // to the appropriate height of the toolbar.
-    canvas->TileImageInt(*toolbar_left,
-                         toolbar_bounds.x() - toolbar_left->width(),
-                         toolbar_bounds.y(), toolbar_left->width(),
-                         toolbar_bounds.height());
-    canvas->TileImageInt(*toolbar_center,
-                         toolbar_bounds.x(), toolbar_bounds.y(),
-                         toolbar_bounds.width(), toolbar_center->height());
-    canvas->TileImageInt(*toolbar_right, toolbar_bounds.right(),
-                         toolbar_bounds.y(), toolbar_right->width(),
-                         toolbar_bounds.height());
-
-    if (frame_->window_delegate()->ShouldShowWindowTitle()) {
-      // Since we're showing the toolbar or the tabstrip, we need to draw a
-      // single pixel grey line along underneath them to terminate them
-      // cleanly.
-      canvas->FillRectInt(SkColorSetRGB(180, 188, 199), toolbar_bounds.x(),
-                          toolbar_bounds.bottom() - 1, toolbar_bounds.width(),
-                          1);
-    }
-  }
+  // We use TileImageInt for the left and right caps to clip the rendering
+  // to the appropriate height of the toolbar.
+  canvas->TileImageInt(*toolbar_left,
+                       toolbar_bounds.x() - toolbar_left->width(),
+                       toolbar_bounds.y(), toolbar_left->width(),
+                       toolbar_bounds.height());
+  canvas->TileImageInt(*toolbar_center,
+                       toolbar_bounds.x(), toolbar_bounds.y(),
+                       toolbar_bounds.width(), toolbar_center->height());
+  canvas->TileImageInt(*toolbar_right, toolbar_bounds.right(),
+                       toolbar_bounds.y(), toolbar_right->width(),
+                       toolbar_bounds.height());
 }
 
 void AeroGlassNonClientView::PaintClientEdge(ChromeCanvas* canvas) {
   SkBitmap* right = resources_->GetPartBitmap(FRAME_CLIENT_EDGE_RIGHT);
   SkBitmap* bottom_right =
       resources_->GetPartBitmap(FRAME_CLIENT_EDGE_BOTTOM_RIGHT);
   SkBitmap* bottom = resources_->GetPartBitmap(FRAME_CLIENT_EDGE_BOTTOM);
   SkBitmap* bottom_left =
       resources_->GetPartBitmap(FRAME_CLIENT_EDGE_BOTTOM_LEFT);
   SkBitmap* left = resources_->GetPartBitmap(FRAME_CLIENT_EDGE_LEFT);
@@ skipping 31 matching lines @@
                         client_area_bounds.x() - bottom_left->width(),
                         client_area_bounds.bottom() - bottom_left->height() +
                             kPixel);
   canvas->TileImageInt(*left, client_area_bounds.x() - left->width(),
                        client_area_bounds.y() + fudge, left->width(),
                        client_area_bounds.height() - bottom_left->height() +
                            kPixel - fudge);
 }
 
 void AeroGlassNonClientView::LayoutOTRAvatar() {
-  int otr_x = 0;
-  int top_spacing = frame_->IsMaximized() ? kNoTitleOTRZoomedTopSpacing
-                                          : kNoTitleOTRTopSpacing;
-  int otr_y = browser_view_->GetTabStripHeight() + top_spacing;
-  int otr_width = 0;
-  int otr_height = 0;
-  if (browser_view_->ShouldShowOffTheRecordAvatar()) {
-    SkBitmap otr_avatar_icon = browser_view_->GetOTRAvatarIcon();
-    otr_width = otr_avatar_icon.width();
-    otr_height = otr_avatar_icon.height();
-    otr_x = kOTRAvatarIconMargin;
-    otr_y -= otr_avatar_icon.height() + 2;
-  }
-  otr_avatar_bounds_.SetRect(otr_x, otr_y, otr_width, otr_height);
+  SkBitmap otr_avatar_icon = browser_view_->GetOTRAvatarIcon();
+  int top_height = (frame_->IsMaximized() ?
+      (CalculateNonClientTopHeight() - 2) : kTabStripY);
+  int tabstrip_height = browser_view_->GetTabStripHeight() - kOTRBottomSpacing;
+  int otr_height = frame_->IsMaximized() ?
+      (tabstrip_height - kOTRMaximizedTopSpacing) :
+      otr_avatar_icon.height();
+  otr_avatar_bounds_.SetRect(
+      kWindowHorizontalClientEdgeWidth + kOTRSideSpacing,
+      top_height + tabstrip_height - otr_height, otr_avatar_icon.width(),
+      otr_height);
 }
 
 void AeroGlassNonClientView::LayoutDistributorLogo() {
   if (distributor_logo_.empty())
     return;
 
   int logo_w = distributor_logo_.width();
   int logo_h = distributor_logo_.height();
   
   int w = width();
@@ skipping 16 matching lines @@
     resources_ = new AeroGlassWindowResources;
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 #if defined(GOOGLE_CHROME_BUILD)
     distributor_logo_ = *rb.GetBitmapNamed(IDR_DISTRIBUTOR_LOGO);
 #endif
 
     initialized = true;
   }
 }