diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 19:26:49 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 19:26:49 +0000 |
| commit | 5e70f14644629b7f9fe9126553758aed25e17128 (patch) | |
| tree | 65bd07608366d1f3004535e2ca91a9089327ed92 /views | |
| parent | 1bf956b6f611bd3e116489bfdef7ac9048db0308 (diff) | |
| download | chromium_src-5e70f14644629b7f9fe9126553758aed25e17128.zip chromium_src-5e70f14644629b7f9fe9126553758aed25e17128.tar.gz chromium_src-5e70f14644629b7f9fe9126553758aed25e17128.tar.bz2 | |
Reverts linux font change again. Slow down isn't as bad as before. But
still not ideal.
BUG=none
TEST=none
TBR=agl
Review URL: http://codereview.chromium.org/194105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/button/native_button_gtk.cc | 5 | ||||
| -rw-r--r-- | views/controls/textfield/native_textfield_gtk.cc | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/views/controls/button/native_button_gtk.cc b/views/controls/button/native_button_gtk.cc index 0632b21..d1fb0ef4 100644 --- a/views/controls/button/native_button_gtk.cc +++ b/views/controls/button/native_button_gtk.cc @@ -41,8 +41,11 @@ void NativeButtonGtk::UpdateFont() { if (!native_view()) return; + NOTIMPLEMENTED(); preferred_size_ = gfx::Size(); - gtk_widget_modify_font(native_view(), native_button_->font().nativeFont()); + // SendMessage(GetHWND(), WM_SETFONT, + // reinterpret_cast<WPARAM>(native_button_->font().hfont()), + // FALSE); } void NativeButtonGtk::UpdateEnabled() { diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc index 34c4a1f..ef7a67d 100644 --- a/views/controls/textfield/native_textfield_gtk.cc +++ b/views/controls/textfield/native_textfield_gtk.cc @@ -105,7 +105,8 @@ void NativeTextfieldGtk::UpdateReadOnly() { void NativeTextfieldGtk::UpdateFont() { if (!native_view()) return; - gtk_widget_modify_font(native_view(), textfield_->font().nativeFont()); + gtk_widget_modify_font(native_view(), + gfx::Font::PangoFontFromGfxFont(textfield_->font())); } void NativeTextfieldGtk::UpdateEnabled() { |