Add support for blue buttons.

ui/views/controls/button/label_button.cc

 // Copyright (c) 2012 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/label_button.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/focus_border.h"
 #include "ui/views/window/dialog_delegate.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/color_utils.h"
 #include "ui/native_theme/native_theme_win.h"
 #endif
 
 namespace {
 
 // The spacing between the icon and text.
 const int kSpacing = 5;
 
 // The length of the hover fade animation.
 const int kHoverAnimationDurationMs = 170;
 
+// Blue button style default font colors.
+const SkColor kBlueButtonEnabledColor = SK_ColorWHITE;
+const SkColor kBlueButtonDisabledColor = SK_ColorWHITE;

[msw, 2013/05/13 18:27:20]

nit: consider using a single constant for the matching colors.

[benwells, 2013/05/16 11:01:13]

Done.

+
 }  // namespace
 
 namespace views {
 
 // static
 const char LabelButton::kViewClassName[] = "views/LabelButton";
 
 LabelButton::LabelButton(ButtonListener* listener, const string16& text)
     : CustomButton(listener),
       image_(new ImageView()),
@@ skipping 105 matching lines @@
   if (style == STYLE_BUTTON || style == STYLE_NATIVE_TEXTBUTTON) {
     label_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
     set_focusable(true);
   }
   if (style == STYLE_BUTTON) {
     set_min_size(gfx::Size(70, 31));
     const SkColor color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_WindowBackground);
     label_->SetShadowColors(color, color);
     label_->SetShadowOffset(0, 1);
+  } else if (style == STYLE_BLUE_BUTTON) {

[msw, 2013/05/13 18:27:20]

Please implement the blue buttons' 1px #538CEA drop shadow at 90 degrees,
specified in the mock. It'll be similar to STYLE_BUTTON's label shadow above:
https://docs.google.com/a/chromium.org/folder/d/0B6x6iYCtKinEcUh6eU1aZ2tKRWM/...

+    if (label_->enabled() && !explicitly_set_colors_[state()])

[msw, 2013/05/13 18:27:20]

Ignore the current enabled/disabled state, both should be white regardless of
the button's current state. Also, disregard the explicitly set color bit, unless
you have specific client code in mind that sets a button text color then changes
the button style to blue.

[benwells, 2013/05/14 11:30:44]

Yes I was thinking client code should be able to set the font color and set the
style in any order, or even set the style to blue button then to something else.

Is this kind of use not important? Making assumptions about how the interface is
used will simplify the code as I can then use the SetTextColor function as you
describe.

[msw, 2013/05/14 16:20:02]

Maybe we can get API flexibility and code simplicity: Move these
Label::Set[Enabled|Disabled]Color() calls (not SetTextColor() as my other
comment mentions) to ResetColorsFromNativeTheme, as part of your early return.

[benwells, 2013/05/16 11:01:13]

OK, I've moved the logic into ResetColorsFromNativeTheme and I hope made it fit
more into the logic there.

+      label_->SetEnabledColor(kBlueButtonEnabledColor);

[msw, 2013/05/13 18:27:20]

Call SetTextColor here to mark these as explicitly set, so they won't be
overwritten by ResetColorsFromNativeTheme, then remove your change there.

[msw, 2013/05/14 16:20:02]

Ignore this!

+    if (!explicitly_set_colors_[STATE_DISABLED])
+      label_->SetDisabledColor(kBlueButtonDisabledColor);
   }
   // Invalidate the layout to pickup the new insets from the border.
   InvalidateLayout();
   ResetColorsFromNativeTheme();
 }
 
 gfx::Size LabelButton::GetPreferredSize() {
   // Accommodate bold text in case this STYLE_BUTTON button is made default.
   const gfx::Font font = label_->font();
   if (style_ == STYLE_BUTTON)
@@ skipping 28 matching lines @@
   if (max_size_.height() > 0)
     size.set_height(std::min(max_size_.height(), size.height()));
   return size;
 }
 
 const char* LabelButton::GetClassName() const {
   return kViewClassName;
 }
 
 void LabelButton::ResetColorsFromNativeTheme() {
+  if (style() == STYLE_BLUE_BUTTON)

[msw, 2013/05/13 18:27:20]

This isn't needed if you just call SetTextColor above.

+    return;
+
   const ui::NativeTheme* theme = GetNativeTheme();
   SkColor colors[STATE_COUNT] = {
     theme->GetSystemColor(ui::NativeTheme::kColorId_TextButtonEnabledColor),
     theme->GetSystemColor(ui::NativeTheme::kColorId_TextButtonHoverColor),
     theme->GetSystemColor(ui::NativeTheme::kColorId_TextButtonHoverColor),
     theme->GetSystemColor(ui::NativeTheme::kColorId_TextButtonDisabledColor),
   };
 
   // Certain styles do not change text color when hovered or pressed.
   bool constant_text_color = style() == STYLE_BUTTON;
 #if defined(OS_WIN)
   constant_text_color |= (style() == STYLE_NATIVE_TEXTBUTTON &&
                           theme == ui::NativeThemeWin::instance());
 #endif
   if (constant_text_color)
     colors[STATE_HOVERED] = colors[STATE_PRESSED] = colors[STATE_NORMAL];
 
   for (size_t state = STATE_NORMAL; state < STATE_COUNT; ++state) {
     if (!explicitly_set_colors_[state]) {
       SetTextColor(static_cast<ButtonState>(state), colors[state]);
       explicitly_set_colors_[state] = false;
     }
   }
 }
 
 void LabelButton::StateChanged() {
   const gfx::Size previous_image_size(image_->GetPreferredSize());
   image_->SetImage(GetImage(state()));
-  const SkColor color = button_state_colors_[state()];
+  SkColor color = button_state_colors_[state()];
+  if (style() == STYLE_BLUE_BUTTON && ! explicitly_set_colors_[state()])

[msw, 2013/05/13 18:27:20]

You shouldn't need to modify StateChanged at all.

[benwells, 2013/05/16 11:01:13]

Done.

+    color = kBlueButtonEnabledColor;
   if (state() != STATE_DISABLED && label_->enabled_color() != color)
     label_->SetEnabledColor(color);
   label_->SetEnabled(state() != STATE_DISABLED);
   if (image_->GetPreferredSize() != previous_image_size)
     Layout();
 }
 
 void LabelButton::Layout() {
   gfx::Rect child_area(GetLocalBounds());
   child_area.Inset(GetInsets());
@@ skipping 93 matching lines @@
   params->button.indeterminate = false;
   params->button.is_default = is_default_;
   params->button.is_focused = HasFocus() && IsAccessibilityFocusable();
   params->button.has_border = style() == STYLE_NATIVE_TEXTBUTTON;
   params->button.classic_state = 0;
   params->button.background_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextButtonBackgroundColor);
 }
 
 }  // namespace views