diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-09 22:22:08 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-09 22:22:08 +0000 |
| commit | 99e4d4c0c61ca0d7548097520fb4dbeb998086f9 (patch) | |
| tree | d9ca68fe9ae6c242acc8663a6d34ef485de7b377 /views/controls/menu/menu_item_view_gtk.cc | |
| parent | 8a4751337e754922bf46834b8b3c277a4dcdb44b (diff) | |
| download | chromium_src-99e4d4c0c61ca0d7548097520fb4dbeb998086f9.zip chromium_src-99e4d4c0c61ca0d7548097520fb4dbeb998086f9.tar.gz chromium_src-99e4d4c0c61ca0d7548097520fb4dbeb998086f9.tar.bz2 | |
Multi-Profiles: Add icon chooser to profiles menu
This change adds an icon chooser grid to the profiles menu. This is only implemented for toolkit views for now.
Screenshots: http://www.dropmocks.com/mXGba
BUG=
TEST=
Review URL: http://codereview.chromium.org/7331017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/menu_item_view_gtk.cc')
| -rw-r--r-- | views/controls/menu/menu_item_view_gtk.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc index 9ff9ca1..d6dbd35 100644 --- a/views/controls/menu/menu_item_view_gtk.cc +++ b/views/controls/menu/menu_item_view_gtk.cc @@ -35,10 +35,12 @@ gfx::Size MenuItemView::CalculatePreferredSize() { #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) { |