[Win, Linux] Always display the avatar button text at the same size.

chrome/browser/ui/views/profiles/new_avatar_button.cc

 // Copyright 2014 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/profiles/new_avatar_button.h"
 
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/browser.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/painter.h"
 
 namespace {
 
+const int kDisplayFontHeight = 15;

[Peter Kasting, 2014/08/28 19:34:17]

Where does this come from?  Can we derive this from the heights of some image
resources or other views?

[msw, 2014/08/28 19:40:03]

Was this height derived visually from the button assets? It looks like the
themed button internal area is 15 pixels, but it looks like Win Glass could
potentially use 16 pixels. Even better if you could derive these values from the
button height (and image set heights?).

[noms (inactive), 2014/08/28 20:36:25]

Hmm, it was, yes. Working on getting something better working (using the height
and the insets, maybe?) :/

On 2014/08/28 19:40:03, msw wrote:

[msw, 2014/08/28 21:43:50]

Give it a shot, I'd be okay with a literal (and a comment explaining its origin)
iff there's no clear way to derive the value from the button height, the insets,
and the image set heights.

[noms (inactive), 2014/08/29 17:10:29]

I went with adding a comment. Button height + insets alone weren't enough, and
I'd like to land this as soon as possible, if it's not a deal breaker.

On 2014/08/28 21:43:50, msw wrote:

+
 scoped_ptr<views::Border> CreateBorder(const int normal_image_set[],
                                        const int hot_image_set[],
                                        const int pushed_image_set[]) {
   scoped_ptr<views::LabelButtonBorder> border(
       new views::LabelButtonBorder(views::Button::STYLE_TEXTBUTTON));
   border->SetPainter(false, views::Button::STATE_NORMAL,
       views::Painter::CreateImageGridPainter(normal_image_set));
   border->SetPainter(false, views::Button::STATE_HOVERED,
       views::Painter::CreateImageGridPainter(hot_image_set));
   border->SetPainter(false, views::Button::STATE_PRESSED,
@@ skipping 21 matching lines @@
                  true),
       browser_(browser) {
   set_animate_on_state_change(false);
   SetTextColor(views::Button::STATE_NORMAL, SK_ColorWHITE);
   SetTextColor(views::Button::STATE_HOVERED, SK_ColorWHITE);
   SetTextColor(views::Button::STATE_PRESSED, SK_ColorWHITE);
   SetTextShadows(gfx::ShadowValues(10,
       gfx::ShadowValue(gfx::Point(), 1.0f, SK_ColorDKGRAY)));
   SetTextSubpixelRenderingEnabled(false);
 
+  // Shrink large fonts to make them fit.
+  SetFontList(GetFontList().GetLargestFontListWithHeightBound(
+      kDisplayFontHeight));
+
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   if (button_style == THEMED_BUTTON) {
     const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_NORMAL);
     const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_HOVER);
     const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_PRESSED);
 
     SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
     set_menu_marker(
         rb->GetImageNamed(IDR_AVATAR_THEMED_BUTTON_DROPARROW).ToImageSkia());
 #if defined(OS_WIN)
@@ skipping 79 matching lines @@
   // We want the button to resize if the new text is shorter.
   SetText(profiles::GetAvatarButtonTextForProfile(browser_->profile()));
   SetMinSize(gfx::Size());
   InvalidateLayout();
 
   // Because the width of the button might have changed, the parent browser
   // frame needs to recalculate the button bounds and redraw it.
   if (parent())
     parent()->Layout();
 }