Fix various issues with popup/app window layout/drawing.

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc

 // Copyright 2013 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/ui/views/frame/opaque_browser_frame_view_layout.h"
 
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 
 namespace {
 
-// The titlebar never shrinks too short to show the caption button plus some
-// padding below it.
 const int kCaptionButtonHeight = 18;
-const int kTitleBarAdditionalPadding = 3;
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 // Default extra space between the top of the frame and the top of the window
 // caption buttons.
 const int kExtraCaption = 2;
 
 // Default extra spacing between individual window caption buttons.
 const int kCaptionButtonSpacing = 2;
 #else
 const int kExtraCaption = 0;
@@ skipping 14 matching lines @@
 // mode, to use to drag the window around.
 const int OpaqueBrowserFrameViewLayout::kNonClientRestoredExtraThickness = 11;
 
 // The frame border is only visible in restored mode and is hardcoded to 4 px on
 // each side regardless of the system window border size.
 const int OpaqueBrowserFrameViewLayout::kFrameBorderThickness = 4;
 
 // The titlebar has a 2 px 3D edge along the top.
 const int OpaqueBrowserFrameViewLayout::kTitlebarTopEdgeThickness = 2;
 
-// The icon is inset 2 px from the left frame border.
-const int OpaqueBrowserFrameViewLayout::kIconLeftSpacing = 2;
+// The icon is inset 1 px from the left frame border.
+const int OpaqueBrowserFrameViewLayout::kIconLeftSpacing = 1;
 
 // There is a 4 px gap between the icon and the title text.
 const int OpaqueBrowserFrameViewLayout::kIconTitleSpacing = 4;
 
 // The horizontal spacing to use in most cases when laying out things near the
 // caption button area.
 const int OpaqueBrowserFrameViewLayout::kCaptionSpacing = 5;
 
+// The minimum vertical padding between the bottom of the caption buttons and
+// the top of the content shadow.
+const int OpaqueBrowserFrameViewLayout::kCaptionButtonBottomPadding = 3;
+
 // When the title bar is condensed to one row (as when maximized), the New Tab
 // button and the caption buttons are at similar vertical coordinates, so we
 // need to reserve a larger, 16 px gap to avoid looking too cluttered.
 const int OpaqueBrowserFrameViewLayout::kNewTabCaptionCondensedSpacing = 16;
 
 
 OpaqueBrowserFrameViewLayout::OpaqueBrowserFrameViewLayout(
     OpaqueBrowserFrameViewLayoutDelegate* delegate)
     : delegate_(delegate),
       leading_button_start_(0),
@@ skipping 74 matching lines @@
 int OpaqueBrowserFrameViewLayout::NonClientBorderThickness() const {
   const int frame = FrameBorderThickness(false);
   // When we fill the screen, we don't show a client edge.
   return (IsTitleBarCondensed() || delegate_->IsFullscreen()) ?
       frame : (frame + views::NonClientFrameView::kClientEdgeThickness);
 }
 
 int OpaqueBrowserFrameViewLayout::NonClientTopBorderHeight(
     bool restored) const {
   if (delegate_->ShouldShowWindowTitle()) {
-    return std::max(FrameBorderThickness(restored) + delegate_->GetIconSize(),
-                    CaptionButtonY(restored) + kCaptionButtonHeight) +
-        TitlebarBottomThickness(restored);
+    // The + 2 here puts at least 1 px of space on top and bottom of the icon.
+    const int icon_height =
+        TitlebarTopThickness(restored) + delegate_->GetIconSize() + 2;
+    const int caption_button_height = CaptionButtonY(restored) +
+        kCaptionButtonHeight + kCaptionButtonBottomPadding;
+    return std::max(icon_height, caption_button_height) +
+        kContentEdgeShadowThickness;
   }
 
   int thickness = FrameBorderThickness(restored);
   // The tab top inset is equal to the height of any shadow region above the
   // tabs, plus a 1 px top stroke.  In maximized mode, we want to push the
   // shadow region off the top of the screen but leave the top stroke.
   if (!restored && delegate_->IsTabStripVisible() && IsTitleBarCondensed())
     thickness -= GetLayoutInsets(TAB).top() - 1;
   return thickness;
 }
 
 int OpaqueBrowserFrameViewLayout::GetTabStripInsetsTop(bool restored) const {
   const int top = NonClientTopBorderHeight(restored);
   // Annoyingly, the pre-MD layout uses different heights for the hit-test
   // exclusion region (which we want here, since we're trying to size the border
   // so that the region above the tab's hit-test zone matches) versus the shadow
   // thickness.
   const int exclusion = GetLayoutConstant(TAB_TOP_EXCLUSION_HEIGHT);
   return (!restored && (IsTitleBarCondensed() || delegate_->IsFullscreen())) ?
       top : (top + kNonClientRestoredExtraThickness - exclusion);
 }
 
-int OpaqueBrowserFrameViewLayout::TitlebarBottomThickness(bool restored) const {
-  const int thickness =
-      kTitleBarAdditionalPadding + kContentEdgeShadowThickness;
-  return (delegate_->IsToolbarVisible() || !IsTitleBarCondensed() || restored)
-      ? (thickness + views::NonClientFrameView::kClientEdgeThickness)
-      : thickness;
+int OpaqueBrowserFrameViewLayout::TitlebarTopThickness(bool restored) const {
+  return (restored || !IsTitleBarCondensed()) ?
+      kTitlebarTopEdgeThickness : FrameBorderThickness(false);
 }
 
 int OpaqueBrowserFrameViewLayout::CaptionButtonY(bool restored) const {
   // Maximized buttons start at window top, since the window has no border. This
   // offset is for the image (the actual clickable bounds extend all the way to
   // the top to take Fitts' Law into account).
   const int frame = (!restored && IsTitleBarCondensed()) ?
       FrameBorderThickness(false) :
       views::NonClientFrameView::kFrameShadowThickness;
   return frame + extra_caption_y_;
@@ skipping 79 matching lines @@
     use_hidden_icon_location = false;
 
     // 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 when the window is
     // restored, instead of calculating the remaining space from below the
     // frame border, we calculate from below the 3D edge.
-    int unavailable_px_at_top = IsTitleBarCondensed() ?
-        frame_thickness : kTitlebarTopEdgeThickness;
+    const int unavailable_px_at_top = TitlebarTopThickness(false);
     // When the icon is shorter than the minimum space we reserve for the
     // caption button, we vertically center it.  We want to bias rounding to
-    // put extra space above the icon, since the 3D edge (+ client edge, for
-    // restored windows) below looks (to the eye) more like additional space
-    // than does the 3D edge (or nothing at all, for maximized windows)
-    // above; hence the +1.
-    int y = unavailable_px_at_top + (NonClientTopBorderHeight(false) -
-                                     unavailable_px_at_top - size -
-                                     TitlebarBottomThickness(false) + 1) / 2;
+    // put extra space below the icon, since we'll use the same Y coordinate for
+    // the title, and the majority of the font weight is below the centerline.
+    const int icon_height =
+        unavailable_px_at_top + size + kContentEdgeShadowThickness;
+    const int y = unavailable_px_at_top +
+        (NonClientTopBorderHeight(false) - icon_height) / 2;
 
     window_icon_bounds_ = gfx::Rect(leading_button_start_ + kIconLeftSpacing, y,
                                     size, size);
     leading_button_start_ += size + kIconLeftSpacing;
     minimum_size_for_buttons_ += size + kIconLeftSpacing;
   }
 
   if (should_show_icon)
     window_icon_->SetBoundsRect(window_icon_bounds_);
 
@@ skipping 305 matching lines @@
 
 void OpaqueBrowserFrameViewLayout::ViewAdded(views::View* host,
                                              views::View* view) {
   SetView(view->id(), view);
 }
 
 void OpaqueBrowserFrameViewLayout::ViewRemoved(views::View* host,
                                                views::View* view) {
   SetView(view->id(), nullptr);
 }