Make non-glass popups match new mockup from Glen....

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/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gfx/path.h"
@@ skipping 43 matching lines @@
   FRAME_CLIENT_EDGE_BOTTOM_RIGHT,
   FRAME_CLIENT_EDGE_BOTTOM,
   FRAME_CLIENT_EDGE_BOTTOM_LEFT,
   FRAME_CLIENT_EDGE_LEFT,
 
   // No-toolbar client edge.
   FRAME_NO_TOOLBAR_TOP_LEFT,
   FRAME_NO_TOOLBAR_TOP_CENTER,
   FRAME_NO_TOOLBAR_TOP_RIGHT,
 
-  // Popup-mode toolbar edges.
-  FRAME_TOOLBAR_POPUP_EDGE_LEFT,
-  FRAME_TOOLBAR_POPUP_EDGE_RIGHT,
-
   FRAME_PART_BITMAP_COUNT  // Must be last.
 };
 
 class ActiveWindowResources : public views::WindowResources {
  public:
   ActiveWindowResources() {
     InitClass();
   }
   virtual ~ActiveWindowResources() { }
 
@@ skipping 14 matching lines @@
         IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P,
         IDR_WINDOW_BOTTOM_CENTER, IDR_WINDOW_BOTTOM_LEFT_CORNER,
             IDR_WINDOW_BOTTOM_RIGHT_CORNER, IDR_WINDOW_LEFT_SIDE,
             IDR_WINDOW_RIGHT_SIDE, IDR_WINDOW_TOP_CENTER,
             IDR_WINDOW_TOP_LEFT_CORNER, IDR_WINDOW_TOP_RIGHT_CORNER,
         IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
             IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
             IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
             IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
         IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
-        IDR_LOCATIONBG_POPUPMODE_LEFT, IDR_LOCATIONBG_POPUPMODE_RIGHT,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       for (int i = 0; i < FRAME_PART_BITMAP_COUNT; ++i)
         standard_frame_bitmaps_[i] = rb.GetBitmapNamed(kFramePartBitmapIds[i]);
       initialized = true;
     }
   }
 
   static SkBitmap* standard_frame_bitmaps_[FRAME_PART_BITMAP_COUNT];
@@ skipping 25 matching lines @@
         IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P,
         IDR_DEWINDOW_BOTTOM_CENTER, IDR_DEWINDOW_BOTTOM_LEFT_CORNER,
             IDR_DEWINDOW_BOTTOM_RIGHT_CORNER, IDR_DEWINDOW_LEFT_SIDE,
             IDR_DEWINDOW_RIGHT_SIDE, IDR_DEWINDOW_TOP_CENTER,
             IDR_DEWINDOW_TOP_LEFT_CORNER, IDR_DEWINDOW_TOP_RIGHT_CORNER,
         IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
             IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
             IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
             IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
         IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
-        IDR_LOCATIONBG_POPUPMODE_LEFT, IDR_LOCATIONBG_POPUPMODE_RIGHT,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       for (int i = 0; i < FRAME_PART_BITMAP_COUNT; ++i)
         standard_frame_bitmaps_[i] = rb.GetBitmapNamed(kFramePartBitmapIds[i]);
       initialized = true;
     }
   }
 
   static SkBitmap* standard_frame_bitmaps_[FRAME_PART_BITMAP_COUNT];
@@ skipping 25 matching lines @@
         IDR_MINIMIZE, IDR_MINIMIZE_H, IDR_MINIMIZE_P,
         IDR_WINDOW_BOTTOM_CENTER_OTR, IDR_WINDOW_BOTTOM_LEFT_CORNER_OTR,
             IDR_WINDOW_BOTTOM_RIGHT_CORNER_OTR, IDR_WINDOW_LEFT_SIDE_OTR,
             IDR_WINDOW_RIGHT_SIDE_OTR, IDR_WINDOW_TOP_CENTER_OTR,
             IDR_WINDOW_TOP_LEFT_CORNER_OTR, IDR_WINDOW_TOP_RIGHT_CORNER_OTR,
         IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
             IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
             IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
             IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
         IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
-        IDR_LOCATIONBG_POPUPMODE_LEFT, IDR_LOCATIONBG_POPUPMODE_RIGHT,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       for (int i = 0; i < FRAME_PART_BITMAP_COUNT; ++i)
         standard_frame_bitmaps_[i] = rb.GetBitmapNamed(kFramePartBitmapIds[i]);
       initialized = true;
     }
   }
 
   static SkBitmap* standard_frame_bitmaps_[FRAME_PART_BITMAP_COUNT];
@@ skipping 26 matching lines @@
         IDR_DEWINDOW_BOTTOM_CENTER_OTR, IDR_DEWINDOW_BOTTOM_LEFT_CORNER_OTR,
             IDR_DEWINDOW_BOTTOM_RIGHT_CORNER_OTR, IDR_DEWINDOW_LEFT_SIDE_OTR,
             IDR_DEWINDOW_RIGHT_SIDE_OTR, IDR_DEWINDOW_TOP_CENTER_OTR,
             IDR_DEWINDOW_TOP_LEFT_CORNER_OTR,
             IDR_DEWINDOW_TOP_RIGHT_CORNER_OTR,
         IDR_CONTENT_TOP_LEFT_CORNER, IDR_CONTENT_TOP_CENTER,
             IDR_CONTENT_TOP_RIGHT_CORNER, IDR_CONTENT_RIGHT_SIDE,
             IDR_CONTENT_BOTTOM_RIGHT_CORNER, IDR_CONTENT_BOTTOM_CENTER,
             IDR_CONTENT_BOTTOM_LEFT_CORNER, IDR_CONTENT_LEFT_SIDE,
         IDR_APP_TOP_LEFT, IDR_APP_TOP_CENTER, IDR_APP_TOP_RIGHT,
-        IDR_LOCATIONBG_POPUPMODE_LEFT, IDR_LOCATIONBG_POPUPMODE_RIGHT,
       };
 
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       for (int i = 0; i < FRAME_PART_BITMAP_COUNT; ++i)
         standard_frame_bitmaps_[i] = rb.GetBitmapNamed(kFramePartBitmapIds[i]);
       initialized = true;
     }
   }
 
   static SkBitmap* standard_frame_bitmaps_[FRAME_PART_BITMAP_COUNT];
@@ skipping 223 matching lines @@
   int border_thickness = NonClientBorderThickness();
   return gfx::Size(width + (2 * border_thickness),
                    height + NonClientTopBorderHeight() + border_thickness);
 }
 
 gfx::Point OpaqueNonClientView::GetSystemMenuPoint() const {
   int tabstrip_height = browser_view_->IsTabStripVisible() ?
       browser_view_->GetTabStripHeight() : 0;
   gfx::Point system_menu_point(FrameBorderThickness(),
       NonClientTopBorderHeight() + tabstrip_height -
-      BottomEdgeThicknessWithinNonClientHeight());
+      UnavailablePixelsAtBottomOfNonClientHeight());
   ConvertPointToScreen(this, &system_menu_point);
   return system_menu_point;
 }
 
 int OpaqueNonClientView::NonClientHitTest(const gfx::Point& point) {
   if (!bounds().Contains(point))
     return HTNOWHERE;
 
   int frame_component = frame_->client_view()->NonClientHitTest(point);
   if (frame_component != HTNOWHERE)
@@ skipping 193 matching lines @@
   if (frame_->window_delegate()->ShouldShowWindowTitle()) {
     int title_top_spacing, title_thickness;
     return TitleCoordinates(&title_top_spacing, &title_thickness);
   }
 
   return FrameBorderThickness() +
       ((frame_->IsMaximized() || browser_view_->IsFullscreen()) ?
       0 : kNonClientRestoredExtraThickness);
 }
 
-int OpaqueNonClientView::BottomEdgeThicknessWithinNonClientHeight() const {
+int OpaqueNonClientView::UnavailablePixelsAtBottomOfNonClientHeight() const {
+  // Tricky: When a toolbar is edging the titlebar, it not only draws its own
+  // shadow and client edge, but an extra, light "shadow" pixel as well, which
+  // is treated as available space.  Thus the nonclient area actually _fails_ to
+  // include some available pixels, leading to a negative number here.
   if (browser_view_->IsToolbarVisible())
-    return 0;
+    return -kFrameShadowThickness;
+
   return kFrameShadowThickness +
       (frame_->IsMaximized() ? 0 : kClientEdgeThickness);
 }
 
 int OpaqueNonClientView::TitleCoordinates(int* title_top_spacing,
                                           int* title_thickness) const {
   int frame_thickness = FrameBorderThickness();
   int min_titlebar_height = kTitlebarMinimumHeight + frame_thickness;
   *title_top_spacing = frame_thickness + kTitleTopSpacing;
   // The bottom spacing should be the same apparent height as the top spacing.
   // Because the actual top spacing height varies based on the system border
   // thickness, we calculate this based on the restored top spacing and then
   // adjust for maximized mode.  We also don't include the frame shadow here,
   // since while it's part of the bottom spacing it will be added in at the end
   // as necessary (when a toolbar is present, the "shadow" is actually drawn by
   // the toolbar).
   int title_bottom_spacing =
       kFrameBorderThickness + kTitleTopSpacing - kFrameShadowThickness;
   if (frame_->IsMaximized()) {
     // When we maximize, the top border appears to be chopped off; shift the
     // title down to stay centered within the remaining space.
     int title_adjust = (kFrameBorderThickness / 2);
     *title_top_spacing += title_adjust;
     title_bottom_spacing -= title_adjust;
   }
   *title_thickness = std::max(title_font_.height(),
       min_titlebar_height - *title_top_spacing - title_bottom_spacing);
   return *title_top_spacing + *title_thickness + title_bottom_spacing +
-      BottomEdgeThicknessWithinNonClientHeight();
+      UnavailablePixelsAtBottomOfNonClientHeight();
 }
 
 void OpaqueNonClientView::PaintRestoredFrameBorder(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 =
@@ skipping 75 matching lines @@
      * shadow color (since we want to work with various themes), but we can't
      * alpha-blend either (since the Windows text APIs don't really do this).
      * So we'd need to sample the background color at the right location and
      * synthesize a good shadow color. */
   }
 }
 
 void OpaqueNonClientView::PaintToolbarBackground(ChromeCanvas* canvas) {
   if (!browser_view_->IsToolbarVisible())
     return;
-  
+
   gfx::Rect toolbar_bounds(browser_view_->GetToolbarBounds());
   gfx::Point toolbar_origin(toolbar_bounds.origin());
   View::ConvertPointToView(frame_->client_view(), this, &toolbar_origin);
   toolbar_bounds.set_origin(toolbar_origin);
 
-  bool normal_mode = browser_view_->IsToolbarDisplayModeNormal();
-  SkBitmap* toolbar_left = resources()->GetPartBitmap(normal_mode ?
-      FRAME_CLIENT_EDGE_TOP_LEFT : FRAME_TOOLBAR_POPUP_EDGE_LEFT);
+  SkBitmap* toolbar_left =
+      resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_LEFT);
   canvas->DrawBitmapInt(*toolbar_left,
                         toolbar_bounds.x() - toolbar_left->width(),
                         toolbar_bounds.y());
 
-  if (normal_mode) {
-    SkBitmap* toolbar_center =
-        resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP);
-    canvas->TileImageInt(*toolbar_center, toolbar_bounds.x(),
-        toolbar_bounds.y(), toolbar_bounds.width(), toolbar_center->height());
-  }
+  // Gross hack: We split the toolbar image into two pieces, since sometimes
+  // (popup mode) the toolbar isn't tall enough to show the whole image.  The
+  // split happens between the top shadow section and the bottom gradient
+  // section so that we never break the gradient.
+  int split_point = kFrameShadowThickness * 2;
+  SkBitmap* toolbar_center =
+      resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP);
+  canvas->TileImageInt(*toolbar_center, 0, 0, toolbar_bounds.x(),
+      toolbar_bounds.y(), toolbar_bounds.width(), split_point);
+  canvas->TileImageInt(*toolbar_center, 0,
+      toolbar_center->height() - toolbar_bounds.height() + split_point,
+      toolbar_bounds.x(), toolbar_bounds.y() + split_point,
+      toolbar_bounds.width(), toolbar_bounds.height() - split_point);
 
-  canvas->DrawBitmapInt(*resources()->GetPartBitmap(normal_mode ?
-      FRAME_CLIENT_EDGE_TOP_RIGHT : FRAME_TOOLBAR_POPUP_EDGE_RIGHT),
+  canvas->DrawBitmapInt(
+      *resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_RIGHT),
       toolbar_bounds.right(), toolbar_bounds.y());
 }
 
 void OpaqueNonClientView::PaintOTRAvatar(ChromeCanvas* canvas) {
   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 OpaqueNonClientView::PaintRestoredClientEdge(ChromeCanvas* canvas) {
-  int client_area_top =
-      frame_->client_view()->y() + browser_view_->GetToolbarBounds().bottom();
+  int client_area_top = frame_->client_view()->y();
 
   gfx::Rect client_area_bounds = CalculateClientAreaBounds(width(), height());
-  if (browser_view_->IsToolbarVisible() &&
-      browser_view_->IsToolbarDisplayModeNormal()) {
-    // The toolbar draws a client edge along its own bottom edge when it's
-    // visible and in normal mode.  However, it only draws this for the width of
-    // the actual client area, leaving a gap at the left and right edges:
-    //
-    // |             Toolbar             | <-- part of toolbar
-    //  ----- (toolbar client edge) -----  <-- gap
-    // |           Client area           | <-- right client edge
-    //
-    // To address this, we extend the left and right client edges up to fill the
-    // gap, by pretending the toolbar is shorter than it really is.
-    client_area_top -= kClientEdgeThickness;
+  if (browser_view_->IsToolbarVisible()) {
+    // The client edges start below the toolbar upper corner images regardless
+    // of how tall the toolbar itself is.
+    client_area_top += browser_view_->GetToolbarBounds().y() +
+        resources()->GetPartBitmap(FRAME_CLIENT_EDGE_TOP_LEFT)->height();
   } else {
     // The toolbar isn't going to draw a client edge for us, so draw one
     // ourselves.
     // This next calculation is necessary because the top center bitmap is
     // shorter than the top left and right bitmaps.  We need their top edges to
     // line up, and we need the left and right edges to start below the corners'
     // bottoms.
     SkBitmap* top_center =
         resources()->GetPartBitmap(FRAME_NO_TOOLBAR_TOP_CENTER);
     SkBitmap* top_left = resources()->GetPartBitmap(FRAME_NO_TOOLBAR_TOP_LEFT);
@@ skipping 99 matching lines @@
   // Always lay out the icon, even when it's not present, so we can lay out the
   // window title based on its position.
   int frame_thickness = FrameBorderThickness();
   int icon_x = frame_thickness + kIconLeftSpacing;
 
   // The usable height of the titlebar area is the total height minus the top
   // resize border and any edge area we draw at its bottom.
   int title_top_spacing, title_thickness;
   int top_height = TitleCoordinates(&title_top_spacing, &title_thickness);
   int available_height = top_height - frame_thickness -
-      BottomEdgeThicknessWithinNonClientHeight();
+      UnavailablePixelsAtBottomOfNonClientHeight();
 
   // The icon takes up a constant fraction of the available height, down to a
   // minimum size, and is always an even number of pixels on a side (presumably
   // to make scaled icons look better).  It's centered within the usable height.
   int icon_size = std::max((available_height * kIconHeightFractionNumerator /
       kIconHeightFractionDenominator) / 2 * 2, kIconMinimumSize);
   int icon_y = ((available_height - icon_size) / 2) + frame_thickness;
 
   // Hack: Our frame border has a different "3D look" than Windows'.  Theirs has
   // a more complex gradient on the top that they push their icon/title below;
@@ skipping 55 matching lines @@
 }
 
 // static
 void OpaqueNonClientView::InitAppWindowResources() {
   static bool initialized = false;
   if (!initialized) {
     title_font_ = win_util::GetWindowTitleFont();
     initialized = true;
   }
 }