summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authoraltimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-30 16:24:04 +0000
committeraltimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-30 16:24:04 +0000
commit54d950537abba5f32d79261ccdddb5d0f2df9e04 (patch)
treebe007c12762cbdfb8be78f68b7802520254cc851 /views
parentad94b004ea85fa82e0f1a67b89a79fddb8885241 (diff)
downloadchromium_src-54d950537abba5f32d79261ccdddb5d0f2df9e04.zip
chromium_src-54d950537abba5f32d79261ccdddb5d0f2df9e04.tar.gz
chromium_src-54d950537abba5f32d79261ccdddb5d0f2df9e04.tar.bz2
Prevent needless vertical margin change.
When one change horizontal margin, vertical margin is also changed to zero. BUG=chromium-os:8081 TEST=none Review URL: http://codereview.chromium.org/4151012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/textfield/native_textfield_gtk.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index 2a65fbd..1c8126d 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -299,7 +299,8 @@ void NativeTextfieldGtk::SetHorizontalMargins(int left, int right) {
gtk_text_view_set_left_margin(text_view, left);
gtk_text_view_set_right_margin(text_view, right);
} else {
- GtkBorder border = { left, right, 0, 0 };
+ gfx::Insets insets = GetEntryInnerBorder(GTK_ENTRY(native_view()));
+ GtkBorder border = {left, right, insets.top(), insets.bottom()};
gtk_entry_set_inner_border(GTK_ENTRY(native_view()), &border);
}
}