From b7e273f8fc7448ecd476ecdb563a3566eb9bce1e Mon Sep 17 00:00:00 2001 From: "sky@chromium.org" Date: Fri, 11 Sep 2009 21:11:12 +0000 Subject: Nukes font_skia and converts font_gtk to use pango. This was necessitated by Pango and Skia differing on how the fonts are sized, resulting in lots of clipping in views. The only iffy part of this is I've made Font::nativeFont() win/mac only (it isn't used on Linux). I did this to avoid folks accidentally modifying the underlying font out from under Font. That said, I could certainly nuke GetPangoFontDescription in favor of nativeFont() and make it return the PangoFontDescription (not a copy). Let me know if you feel strongly about converting this. Assuming your ok with this, I'll watch the perf tests to make sure this doesn't impact startup. BUG=20823 TEST=none Review URL: http://codereview.chromium.org/195058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26015 0039d316-1c4b-4281-b951-d872f2087c98 --- views/controls/button/native_button_gtk.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'views/controls/button') diff --git a/views/controls/button/native_button_gtk.cc b/views/controls/button/native_button_gtk.cc index c5f0f1a..fd89da2 100644 --- a/views/controls/button/native_button_gtk.cc +++ b/views/controls/button/native_button_gtk.cc @@ -41,11 +41,8 @@ void NativeButtonGtk::UpdateFont() { if (!native_view()) return; - NOTIMPLEMENTED(); preferred_size_ = gfx::Size(); - // SendMessage(GetHWND(), WM_SETFONT, - // reinterpret_cast(native_button_->font().hfont()), - // FALSE); + gtk_widget_modify_font(native_view(), native_button_->font().nativeFont()); } void NativeButtonGtk::UpdateEnabled() { -- cgit v1.1