diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 23:32:04 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 23:32:04 +0000 |
| commit | b7878ad5af389c084b09c270bf774aa73b238125 (patch) | |
| tree | 7dd3fe72d8a7a2c33332dd320743725ae49be076 /views/controls/button | |
| parent | 8cc585ff4dc4239464ff73841cae62d1839faad1 (diff) | |
| download | chromium_src-b7878ad5af389c084b09c270bf774aa73b238125.zip chromium_src-b7878ad5af389c084b09c270bf774aa73b238125.tar.gz chromium_src-b7878ad5af389c084b09c270bf774aa73b238125.tar.bz2 | |
Fixes bug in textfield on views/gtk where we weren't properly
accounting for border size if not specified by style. Also changes
button on views/gtk not to fix the pref height at 29. There is no
reason for us to do this.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/462036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button')
| -rw-r--r-- | views/controls/button/native_button_gtk.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/views/controls/button/native_button_gtk.cc b/views/controls/button/native_button_gtk.cc index e663db6..317e6bd 100644 --- a/views/controls/button/native_button_gtk.cc +++ b/views/controls/button/native_button_gtk.cc @@ -88,8 +88,7 @@ gfx::Size NativeButtonGtk::GetPreferredSize() { if (preferred_size_.IsEmpty()) { GtkRequisition size_request = { 0, 0 }; gtk_widget_size_request(native_view(), &size_request); - preferred_size_.SetSize(size_request.width, - std::max(size_request.height, 29)); + preferred_size_.SetSize(size_request.width, size_request.height); } return preferred_size_; } |