diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 18:32:42 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 18:32:42 +0000 |
| commit | d62e045f1dab01f2582ef062a452c283a9fb20dd (patch) | |
| tree | d826d8e28b27c28007b9d3d6c7a10f20545653b5 /ui/views | |
| parent | 67d972d00c480c86ebc9620a5bd253a001257ad0 (diff) | |
| download | chromium_src-d62e045f1dab01f2582ef062a452c283a9fb20dd.zip chromium_src-d62e045f1dab01f2582ef062a452c283a9fb20dd.tar.gz chromium_src-d62e045f1dab01f2582ef062a452c283a9fb20dd.tar.bz2 | |
linux_aura: Fix all instances of LabelButton sizing.
Previous attempts at fixing this involved tracking down each button
which was setting the minimum size to 0,0. Those attempts are reverted,
as I no longer think they're wrong. The actual fix is to pass through
the views inset size instead of using the GTK inset size.
BUG=349183, 344498, 339247
R=msw@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/187133003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/controls/button/label_button.h | 1 | ||||
| -rw-r--r-- | ui/views/window/dialog_client_view.cc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ui/views/controls/button/label_button.h b/ui/views/controls/button/label_button.h index 7f602fa..2359dbc 100644 --- a/ui/views/controls/button/label_button.h +++ b/ui/views/controls/button/label_button.h @@ -61,7 +61,6 @@ class VIEWS_EXPORT LabelButton : public CustomButton, // Call set_min_size(gfx::Size()) to clear the monotonically increasing size. void set_min_size(const gfx::Size& min_size) { min_size_ = min_size; } - void set_min_width(const int min_width) { min_size_.set_width(min_width); } void set_max_size(const gfx::Size& max_size) { max_size_ = max_size; } // Get or set the option to handle the return key; false by default. diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc index d75ae1f..cdcc98ef 100644 --- a/ui/views/window/dialog_client_view.cc +++ b/ui/views/window/dialog_client_view.cc @@ -383,7 +383,7 @@ LabelButton* DialogClientView::CreateDialogButton(ui::DialogButton type) { button->SetFocusable(true); const int kDialogMinButtonWidth = 75; - button->set_min_width(kDialogMinButtonWidth); + button->set_min_size(gfx::Size(kDialogMinButtonWidth, 0)); button->SetGroup(kButtonGroup); return button; } |