views/controls/menu/native_menu_gtk.cc - Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: views/controls/menu/native_menu_gtk.cc

Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: views/controls/menu/native_menu_gtk.cc

===================================================================

--- views/controls/menu/native_menu_gtk.cc (revision 55911)

+++ views/controls/menu/native_menu_gtk.cc (working copy)

@@ -316,8 +316,9 @@

// The label item is the first child of the menu item.

GtkWidget* label_widget = GTK_BIN(menu_item)->child;

DCHECK(label_widget && GTK_IS_LABEL(label_widget));

- gtk_widget_modify_font(label_widget,

- gfx::Font::PangoFontFromGfxFont(*font));

+ PangoFontDescription* pfd = font->GetNativeFont();

+ gtk_widget_modify_font(label_widget, pfd);

+ pango_font_description_free(pfd);

}

if (type == menus::MenuModel::TYPE_SUBMENU) {

« no previous file with comments | « views/controls/menu/menu_win.cc ('k') | views/controls/menu/native_menu_win.cc » ('j') | no next file with comments »