Better CrOS logout button for vertical trays.

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 {
@@ skipping 143 matching lines @@
 
 void MdTextButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   LabelButton::OnNativeThemeChanged(theme);
   UpdateColors();
 }
 
 SkColor MdTextButton::GetInkDropBaseColor() const {
   return color_utils::DeriveDefaultIconColor(label()->enabled_color());
 }
 
+std::unique_ptr<views::InkDropRipple> MdTextButton::CreateInkDropRipple()
+    const {
+  return std::unique_ptr<views::InkDropRipple>(
+      new views::FloodFillInkDropRipple(
+          GetLocalBounds(), GetInkDropCenterBasedOnLastEvent(),
+          GetInkDropBaseColor(), ink_drop_visible_opacity()));
+}
+
 std::unique_ptr<views::InkDropHighlight> MdTextButton::CreateInkDropHighlight()
     const {
   if (!ShouldShowInkDropHighlight())
     return nullptr;
   if (!is_cta_)
     return LabelButton::CreateInkDropHighlight();
 
   // The call to action hover effect is a shadow.
   const int kYOffset = 1;
   const int kSkiaBlurRadius = 1;
@@ skipping 14 matching lines @@
 bool MdTextButton::ShouldShowInkDropForFocus() const {
   // These types of button use |focus_ring_|.
   return false;
 }
 
 void MdTextButton::SetEnabledTextColors(SkColor color) {
   LabelButton::SetEnabledTextColors(color);
   UpdateColors();
 }
 
+void MdTextButton::SetText(const base::string16& text) {
+  LabelButton::SetText(text);
+  UpdatePaddingForFont();
+}
+
 void MdTextButton::AdjustFontSize(int size_delta) {
   LabelButton::AdjustFontSize(size_delta);
   UpdatePaddingForFont();
 }
 
 void MdTextButton::UpdateStyleToIndicateDefaultStatus() {
   UpdateColors();
 }
 
 void MdTextButton::SetFontList(const gfx::FontList& font_list) {
   NOTREACHED()
       << "Don't call MdTextButton::SetFontList (it will soon be protected)";
 }
 
 MdTextButton::MdTextButton(ButtonListener* listener)
     : LabelButton(listener, base::string16()),
       focus_ring_(new internal::MdFocusRing()),
       is_cta_(false) {
   SetInkDropMode(InkDropMode::ON);
   set_has_ink_drop_action_on_click(true);
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
   SetFocusForPlatform();
   SetMinSize(gfx::Size(kMinWidth, 0));
   SetFocusPainter(nullptr);
   label()->SetAutoColorReadabilityEnabled(false);
   AddChildView(focus_ring_);
   focus_ring_->SetVisible(false);
   set_request_focus_on_press(false);
   LabelButton::SetFontList(GetMdFontList());
-  UpdatePaddingForFont();
 }
 
 MdTextButton::~MdTextButton() {}
 
 void MdTextButton::UpdatePaddingForFont() {
+  // 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);
 
   const int inbuilt_top_padding = font.GetBaseline() - font.GetCapHeight();
@@ skipping 31 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