Correct icon/title sizing/placement for varying titlebar font sizes. This ma...

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/tab_contents.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
@@ skipping 282 matching lines @@
 static const int kWindowControlsRightOffset = 4;
 // The distance between the bottom of the window's top border and the top of the
 // window controls' images when the window is maximized.  We extend the
 // clickable area all the way to the top of the window to obey Fitts' Law.
 static const int kWindowControlsZoomedTopExtraHeight = 1;
 // The distance between right edge of the right-most window control and the left
 // edge of the window's right border when the window is maximized.
 static const int kWindowControlsZoomedRightOffset = 3;
 // The distance between the left edge of the window and the left edge of the
 // window icon when a title-bar is showing and the window is restored.
-static const int kWindowIconLeftOffset = 5;
+static const int kWindowIconLeftOffset = 6;
 // The distance between the right edge of the window's left border and the left
 // edge of the window icon when a title-bar is showing and the window is
 // maximized.
 static const int kWindowIconZoomedLeftOffset = 2;
+// The proportion of vertical space the icon takes up after subtracting the top
+// and bottom borders of the titlebar (expressed as two values to avoid
+// floating point representation errors that goof up the calculation).
+static const int kWindowIconFractionNumerator = 16;
+static const int kWindowIconFractionDenominator = 25;
 // The distance between the top edge of the window and the top edge of the
-// window icon and title when a title-bar is showing and the window is restored.
-static const int kWindowIconAndTitleTopOffset = 6;
+// window title when a title-bar is showing and the window is restored.
+static const int kWindowTitleTopOffset = 6;
 // The distance between the bottom edge of the window's top border and the top
-// edge of the window icon and title when a title-bar is showing and the window
-// is maximized.
-static const int kWindowIconAndTitleZoomedTopOffset = 4;
+// edge of the window title when a title-bar is showing and the window is
+// maximized.
+static const int kWindowTitleZoomedTopOffset = 4;
 // The distance between the window icon and the window title when a title-bar
 // is showing.
 static const int kWindowIconTitleSpacing = 4;
 // The distance between the right edge of the title text bounding box and the
 // left edge of the distributor logo.
 static const int kTitleLogoSpacing = 5;
 // The distance between the bottom of the title text and the TabStrip when a
-// title-bar is showing.
-static const int kTitleBottomSpacing = 6;
+// title-bar is showing and the window is restored.
+static const int kTitleBottomSpacing = 7;
+// The distance between the bottom of the title text and the TabStrip when a
+// title-bar is showing and the window is maximized.
+static const int kTitleZoomedBottomSpacing = 5;
 // The distance between the top edge of the window and the TabStrip when there
 // is no title-bar showing, and the window is restored.
 static const int kNoTitleTopSpacing = 15;
 // The number of pixels to crop off the bottom of the images making up the top
 // client edge when the window is maximized, so we only draw a shadowed titlebar
 // and not a grey client area border below it.
 static const int kClientEdgeZoomedBottomCrop = 1;
 // The amount of horizontal and vertical distance from a corner of the window
 // within which a mouse-drive resize operation will resize the window in two
 // dimensions.
 static const int kResizeAreaCornerSize = 16;
 // The width of the sizing border on the left and right edge of the window.
 static const int kWindowHorizontalBorderSize = 5;
 // The height of the sizing border at the top edge of the window
 static const int kWindowVerticalBorderTopSize = 3;
 // The height of the sizing border on the bottom edge of the window when the
 // window is restored.
 static const int kWindowVerticalBorderBottomSize = 5;
 // The additional height beyond the system-provided thickness of the border on
 // the bottom edge of the window when the window is maximized.
 static const int kWindowVerticalBorderZoomedBottomSize = 1;
-// The width and height of the window icon that appears at the top left of
-// pop-up and app windows.
-static const int kWindowIconSize = 16;
+// The minimum width and height of the window icon that appears at the top left
+// of pop-up and app windows.
+static const int kWindowIconMinimumSize = 16;
+// The minimum height reserved for the window title font.
+static const int kWindowTitleMinimumHeight = 11;
 // The horizontal distance of the right edge of the distributor logo from the
 // left edge of the left-most window control.
 static const int kDistributorLogoHorizontalOffset = 7;
 // The vertical distance of the top of the distributor logo from the top edge
 // of the window.
 static const int kDistributorLogoVerticalOffset = 3;
 // The distance between the left edge of the window and the OTR avatar icon when
 // the window is restored.
 static const int kOTRLeftOffset = 7;
 // The distance between the right edge of the window's left border and the OTR
@@ skipping 346 matching lines @@
 }
 
 void OpaqueNonClientView::SetAccessibleName(const std::wstring& name) {
   accessible_name_ = name;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueNonClientView, private:
 
 int OpaqueNonClientView::CalculateNonClientTopHeight() const {
-  if (frame_->window_delegate()->ShouldShowWindowTitle()) {
-    int top_offset = frame_->IsMaximized() ? (GetSystemMetrics(SM_CYSIZEFRAME) +
-        kWindowIconAndTitleZoomedTopOffset) : kWindowIconAndTitleTopOffset;
-    return top_offset + title_font_.height() + kTitleBottomSpacing;
+  bool show_title = frame_->window_delegate()->ShouldShowWindowTitle();
+  int title_height = std::max(title_font_.height(), kWindowTitleMinimumHeight);
+  if (frame_->IsMaximized()) {
+    int top_height = GetSystemMetrics(SM_CYSIZEFRAME);
+    if (show_title) {
+      top_height += kWindowTitleZoomedTopOffset + title_height +
+          kTitleZoomedBottomSpacing;
+    }
+    if (!browser_view_->IsToolbarVisible())
+      top_height -= kClientEdgeZoomedBottomCrop;
+    return top_height;
   }
-  return frame_->IsMaximized() ?
-      GetSystemMetrics(SM_CYSIZEFRAME) : kNoTitleTopSpacing;
+  return show_title ?
+      (kWindowTitleTopOffset + title_height + kTitleBottomSpacing) :
+      kNoTitleTopSpacing;
 }
 
 int OpaqueNonClientView::HorizontalBorderSize() const {
   return frame_->IsMaximized() ?
       GetSystemMetrics(SM_CXSIZEFRAME) : kWindowHorizontalBorderSize;
 }
 
 int OpaqueNonClientView::VerticalBorderBottomSize() const {
   return frame_->IsMaximized() ? (GetSystemMetrics(SM_CYSIZEFRAME) +
       kWindowVerticalBorderZoomedBottomSize) : kWindowVerticalBorderBottomSize;
@@ skipping 66 matching lines @@
   }
 }
 
 void OpaqueNonClientView::PaintTitleBar(ChromeCanvas* canvas) {
   // The window icon is painted by the TabIconView.
   views::WindowDelegate* d = frame_->window_delegate();
   if (d->ShouldShowWindowTitle()) {
     canvas->DrawStringInt(d->GetWindowTitle(), title_font_, SK_ColorWHITE,
         MirroredLeftPointForRect(title_bounds_), title_bounds_.y(),
         title_bounds_.width(), title_bounds_.height());
+    /* TODO(pkasting):
+    if (app window && active)
+      Draw Drop Shadow;
+    */
   }
 }
 
 void OpaqueNonClientView::PaintToolbarBackground(ChromeCanvas* canvas) {
   if (!browser_view_->IsToolbarVisible() && !browser_view_->IsTabStripVisible())
     return;
 
   gfx::Rect toolbar_bounds(browser_view_->GetToolbarBounds());
   gfx::Point toolbar_origin(toolbar_bounds.origin());
   View::ConvertPointToView(frame_->client_view(), this, &toolbar_origin);
@@ skipping 158 matching lines @@
       kDistributorLogoHorizontalOffset, kDistributorLogoVerticalOffset,
       distributor_logo_.width(), distributor_logo_.height());
 }
 
 void OpaqueNonClientView::LayoutTitleBar() {
   // Size the window icon, even if it is hidden so we can size the title based
   // on its position.
   int left_offset = frame_->IsMaximized() ?
       (GetSystemMetrics(SM_CXSIZEFRAME) + kWindowIconZoomedLeftOffset) :
       kWindowIconLeftOffset;
-  int top_offset = frame_->IsMaximized() ?
-      (GetSystemMetrics(SM_CYSIZEFRAME) + kWindowIconAndTitleZoomedTopOffset) :
-      kWindowIconAndTitleTopOffset;
+
+  // The usable height of the titlebar area is the total height minus the top
+  // resize border, the one shadow pixel at the bottom, and any client edge area
+  // we draw below that shadow pixel (only in restored mode).
+  // TODO(pkasting): Clean up this "4" hack.
+  int top_border_height =
+      frame_->IsMaximized() ? GetSystemMetrics(SM_CYSIZEFRAME) : 4;
+  int available_height = CalculateNonClientTopHeight() - top_border_height - 1;
+  if (!frame_->IsMaximized())
+    available_height -= kClientEdgeZoomedBottomCrop;
+
+  // 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 * kWindowIconFractionNumerator /
+      kWindowIconFractionDenominator) / 2 * 2, kWindowIconMinimumSize);
+  int icon_top_offset =
+      ((available_height - icon_size) / 2) + top_border_height;
+
+  // 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;
+  // then the maximized window cuts this off and the icon/title are centered in
+  // the remaining space.  Because the apparent shape of our border is simpler,
+  // using the same positioning makes things look slightly uncentered with
+  // restored windows, so we come up one pixel to compensate.
+  if (!frame_->IsMaximized())
+    --icon_top_offset;
+
   views::WindowDelegate* d = frame_->window_delegate();
-  int icon_size = d->ShouldShowWindowIcon() ? kWindowIconSize : 0;
-  icon_bounds_.SetRect(left_offset, top_offset, icon_size, icon_size);
+  if (!d->ShouldShowWindowIcon())
+    icon_size = 0;
+  icon_bounds_.SetRect(left_offset, icon_top_offset, icon_size, icon_size);
   if (window_icon_)
     window_icon_->SetBounds(icon_bounds_);
 
   // Size the title, if visible.
   if (d->ShouldShowWindowTitle()) {
     int title_right = logo_bounds_.x() - kTitleLogoSpacing;
     int icon_right = icon_bounds_.right();
     int title_left =
         icon_right + (d->ShouldShowWindowIcon() ? kWindowIconTitleSpacing : 0);
-    title_bounds_.SetRect(title_left, top_offset,
+    int title_top_offset = frame_->IsMaximized() ?
+        (GetSystemMetrics(SM_CYSIZEFRAME) + kWindowTitleZoomedTopOffset) :
+        kWindowTitleTopOffset;
+    if (title_font_.height() < kWindowTitleMinimumHeight) {
+      title_top_offset +=
+          (kWindowTitleMinimumHeight - title_font_.height()) / 2;
+    }
+    title_bounds_.SetRect(title_left, title_top_offset,
         std::max(0, title_right - icon_right), title_font_.height());
   }
 }
 
 void OpaqueNonClientView::LayoutOTRAvatar() {
   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;
@@ skipping 35 matching lines @@
 }
 
 // static
 void OpaqueNonClientView::InitAppWindowResources() {
   static bool initialized = false;
   if (!initialized) {
     title_font_ = win_util::GetWindowTitleFont();
     initialized = true;
   }
 }