diff options
| author | yefim@chromium.org <yefim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 04:10:22 +0000 |
|---|---|---|
| committer | yefim@chromium.org <yefim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 04:10:22 +0000 |
| commit | f9e1f5654c12ba3e7a164374720a9bfe8848c4fb (patch) | |
| tree | 1d0a6656db03ab966754f7f7cf53be5caa8934b8 | |
| parent | 79ff6327718beb0ecbbc5b5c79d1d426acf8f669 (diff) | |
| download | chromium_src-f9e1f5654c12ba3e7a164374720a9bfe8848c4fb.zip chromium_src-f9e1f5654c12ba3e7a164374720a9bfe8848c4fb.tar.gz chromium_src-f9e1f5654c12ba3e7a164374720a9bfe8848c4fb.tar.bz2 | |
Made menu items content to have the same height for item with and without icons.
menu_check.png was changed recently. I'm going to check in 16x16 version of it, after that all menu items will be 29px.
BUG=173262
Review URL: https://chromiumcodereview.appspot.com/12210046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181188 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/views/controls/menu/menu_config.cc | 4 | ||||
| -rw-r--r-- | ui/views/controls/menu/menu_item_view.cc | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ui/views/controls/menu/menu_config.cc b/ui/views/controls/menu/menu_config.cc index 01e4546..4311ac1 100644 --- a/ui/views/controls/menu/menu_config.cc +++ b/ui/views/controls/menu/menu_config.cc @@ -61,8 +61,8 @@ MenuConfig::~MenuConfig() {} void MenuConfig::AdjustForCommonTheme() { render_gutter = false; - item_top_margin = 5; - item_bottom_margin = 5; + item_top_margin = 7; + item_bottom_margin = 6; item_no_icon_top_margin = 7; item_no_icon_bottom_margin = 7; separator_height = 15; diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc index dc49ea9..8dbef92 100644 --- a/ui/views/controls/menu/menu_item_view.cc +++ b/ui/views/controls/menu/menu_item_view.cc @@ -941,7 +941,14 @@ MenuItemView::MenuItemDimensions MenuItemView::GetPreferredDimensions() { MenuItemDimensions dimensions; // Get the container height. dimensions.children_width = child_size.width(); - dimensions.height = child_size.height() + GetBottomMargin() + GetTopMargin(); + dimensions.height = child_size.height(); + // Adjust item content height if menu has both items with and without icons. + // This way all menu items will have the same height. + if (!icon_view_ && GetRootMenuItem()->has_icons()) { + dimensions.height = std::max(dimensions.height, + GetMenuConfig().check_height); + } + dimensions.height += GetBottomMargin() + GetTopMargin(); // In case of a container, only the container size needs to be filled. if (IsContainer()) |