diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 22:00:10 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 22:00:10 +0000 |
| commit | 3101272e0450e86ff9828ccf2381bf669d28af44 (patch) | |
| tree | 9497eb964537c2bd0d2897f7e70375e7b0e33efe /ui/views | |
| parent | 22df770ad3608dce56c0a422f2af04f7788f4fde (diff) | |
| download | chromium_src-3101272e0450e86ff9828ccf2381bf669d28af44.zip chromium_src-3101272e0450e86ff9828ccf2381bf669d28af44.tar.gz chromium_src-3101272e0450e86ff9828ccf2381bf669d28af44.tar.bz2 | |
Tweak new button style height for ChromeOS.
The new button style appears 2px too tall on ChromeOS.
This is due to tight insets and taller text than Windows.
Reduce the inset height to fix this.
The assets have 2px more padding than the original spec.
Increase the minimum height control height to compensate.
(this keeps the control the correct height on Windows)
(Windows was relying on the text's and insets' heights)
See before/after pics at http://crbug.com/155363#c81
BUG=155363
TEST=New button style (enable new dialog style) looks good on CrOS and Win.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16017011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/controls/button/label_button.cc | 2 | ||||
| -rw-r--r-- | ui/views/controls/button/label_button_border.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc index 6014bdc..1ebd0d4 100644 --- a/ui/views/controls/button/label_button.cc +++ b/ui/views/controls/button/label_button.cc @@ -145,7 +145,7 @@ void LabelButton::SetStyle(ButtonStyle style) { set_focusable(true); } if (style == STYLE_BUTTON) { - set_min_size(gfx::Size(70, 31)); + set_min_size(gfx::Size(70, 33)); const SkColor color = GetNativeTheme()->GetSystemColor( ui::NativeTheme::kColorId_WindowBackground); label_->SetShadowColors(color, color); diff --git a/ui/views/controls/button/label_button_border.cc b/ui/views/controls/button/label_button_border.cc index ef82766..a874b6c 100644 --- a/ui/views/controls/button/label_button_border.cc +++ b/ui/views/controls/button/label_button_border.cc @@ -67,7 +67,7 @@ void PaintHelper(LabelButtonBorder* border, LabelButtonBorder::LabelButtonBorder(Button::ButtonStyle style) : style_(style) { if (style == Button::STYLE_BUTTON) { - set_insets(gfx::Insets(9, 13, 9, 13)); + set_insets(gfx::Insets(8, 13, 8, 13)); SetPainter(false, Button::STATE_NORMAL, Painter::CreateImageGridPainter(kNormalImages)); SetPainter(false, Button::STATE_HOVERED, |