Adjust MdTextButton border calculation.

ui/views/controls/button/md_text_button.cc

 // Copyright 2015 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 "ui/views/controls/button/md_text_button.h"
 
 #include "base/i18n/case_conversion.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/ink_drop_painted_layer_delegates.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/painter.h"
 
 namespace views {
 
 namespace {
 
-// Inset between clickable region border and button contents (text).
-const int kHorizontalPadding = 16;
-
 // Minimum size to reserve for the button contents.
 const int kMinWidth = 48;
 
 // The stroke width of the focus border in normal and call to action mode.
 const int kFocusBorderThickness = 1;
 const int kFocusBorderThicknessCta = 2;
 
 // The corner radius of the focus border roundrect.
 const int kFocusBorderCornerRadius = 3;
 
@@ skipping 173 matching lines @@
   return false;
 }
 
 void MdTextButton::SetEnabledTextColors(SkColor color) {
   LabelButton::SetEnabledTextColors(color);
   UpdateColors();
 }
 
 void MdTextButton::SetText(const base::string16& text) {
   LabelButton::SetText(text);
-  UpdatePaddingForFont();
+  UpdatePadding();
 }
 
 void MdTextButton::AdjustFontSize(int size_delta) {
   LabelButton::AdjustFontSize(size_delta);
-  UpdatePaddingForFont();
+  UpdatePadding();
 }
 
 void MdTextButton::UpdateStyleToIndicateDefaultStatus() {
   UpdateColors();
 }
 
 void MdTextButton::SetFontList(const gfx::FontList& font_list) {
   NOTREACHED()
       << "Don't call MdTextButton::SetFontList (it will soon be protected)";
 }
@@ skipping 10 matching lines @@
   SetFocusPainter(nullptr);
   label()->SetAutoColorReadabilityEnabled(false);
   AddChildView(focus_ring_);
   focus_ring_->SetVisible(false);
   set_request_focus_on_press(false);
   LabelButton::SetFontList(GetMdFontList());
 }
 
 MdTextButton::~MdTextButton() {}
 
-void MdTextButton::UpdatePaddingForFont() {
+void MdTextButton::UpdatePadding() {
   // Don't use font-based padding when there's no text visible.
   if (GetText().empty()) {
     SetBorder(Border::NullBorder());
     return;
   }
 
-  // Top and bottom padding depend on the font. Example: if font cap height is
-  // 9dp, use 8dp bottom padding and 7dp top padding to total 24dp.
-  const gfx::FontList& font = label()->font_list();
-  int text_height = font.GetCapHeight();
-  int even_text_height = text_height - (text_height % 2);
-  const int top_padding = even_text_height - (text_height - even_text_height);
-  const int bottom_padding = even_text_height;
-  DCHECK_EQ(3 * even_text_height, top_padding + text_height + bottom_padding);
+  // Text buttons default to 28dp in height on all platforms when the base font
+  // is in use, but should grow or shrink if the font size is adjusted up or
+  // down. When the system font size has been adjusted, the base font will be
+  // larger than normal such that 28dp might not be enough, so also enforce a
+  // minimum height of twice the font size.
+  // Example 1:
+  // * Normal button on ChromeOS, 12pt Roboto. Button height of 28dp.
+  // * Button on ChromeOS that has been adjusted to 14pt Roboto. Button height
+  // of 28 + 2 * 2 = 32dp.
+  // * Linux user sets base system font size to 17dp. For a normal button, the
+  // |size_delta| will be zero, so to adjust upwards we double 17 to get 34.
+  int size_delta =
+      label()->font_list().GetFontSize() - GetMdFontList().GetFontSize();
+  const int kBaseHeight = 28;
+  int target_height = std::max(kBaseHeight + size_delta * 2,
+                               label()->font_list().GetFontSize() * 2);
 
-  const int inbuilt_top_padding = font.GetBaseline() - font.GetCapHeight();
-  const int inbuilt_bottom_padding =
-      font.GetHeight() - label()->font_list().GetBaseline();
+  int label_height = label()->GetPreferredSize().height();
+  int top_padding = (target_height - label_height) / 2;
+  int bottom_padding = (target_height - label_height + 1) / 2;
+  DCHECK_EQ(target_height, label_height + top_padding + bottom_padding);
 
   // TODO(estade): can we get rid of the platform style border hoopla if
   // we apply the MD treatment to all buttons, even GTK buttons?
-  SetBorder(Border::CreateEmptyBorder(
-      top_padding - inbuilt_top_padding, kHorizontalPadding,
-      bottom_padding - inbuilt_bottom_padding, kHorizontalPadding));
+  const int kHorizontalPadding = 16;
+  SetBorder(Border::CreateEmptyBorder(top_padding, kHorizontalPadding,
+                                      bottom_padding, kHorizontalPadding));
 }
 
 void MdTextButton::UpdateColors() {
   ui::NativeTheme::ColorId fg_color_id =
       is_cta_ ? ui::NativeTheme::kColorId_TextOnCallToActionColor
               : ui::NativeTheme::kColorId_ButtonEnabledColor;
 
   ui::NativeTheme* theme = GetNativeTheme();
   if (!explicitly_set_normal_color())
     LabelButton::SetEnabledTextColors(theme->GetSystemColor(fg_color_id));
@@ skipping 13 matching lines @@
   SkColor stroke_color = (is_cta_ || color_utils::IsDark(text_color))
                              ? SkColorSetA(SK_ColorBLACK, kStrokeOpacity)
                              : SkColorSetA(SK_ColorWHITE, 2 * kStrokeOpacity);
 
   set_background(Background::CreateBackgroundPainter(
       true, Painter::CreateRoundRectWith1PxBorderPainter(
                 bg_color, stroke_color, kInkDropSmallCornerRadius)));
 }
 
 }  // namespace views