Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1000)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7331017: Multi-Profiles: Add icon chooser to profiles menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Multi-Profiles: Add icon chooser to profiles menu Created 9 years, 5 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
« no previous file with comments | « views/controls/menu/menu_item_view.cc ('k') | views/controls/menu/menu_item_view_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu_item_view_gtk.cc
===================================================================
--- views/controls/menu/menu_item_view_gtk.cc (revision 91956)
+++ views/controls/menu/menu_item_view_gtk.cc (working copy)
@@ -35,10 +35,12 @@
#else
int height = font.GetHeight();
#endif
+ gfx::Size child_size = GetChildPreferredSize();
return gfx::Size(
font.GetStringWidth(title_) + label_start_ +
- item_right_margin_ + GetChildPreferredWidth(),
- height + GetBottomMargin() + GetTopMargin());
+ item_right_margin_ + child_size.width(),
+ std::max(height, child_size.height()) + GetBottomMargin() +
+ GetTopMargin());
}
void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
« no previous file with comments | « views/controls/menu/menu_item_view.cc ('k') | views/controls/menu/menu_item_view_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698