diff options
| author | yefim@chromium.org <yefim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:01:19 +0000 |
|---|---|---|
| committer | yefim@chromium.org <yefim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:01:19 +0000 |
| commit | 0ce75f3e80c878ddda048ffdcd4360c3c12fb5d9 (patch) | |
| tree | 5ef59b4299d07e5f6bdb2dbe7f7003216c1c739d /ui | |
| parent | 611728e29592c9688fb6cea9bfb4b62e521c712f (diff) | |
| download | chromium_src-0ce75f3e80c878ddda048ffdcd4360c3c12fb5d9.zip chromium_src-0ce75f3e80c878ddda048ffdcd4360c3c12fb5d9.tar.gz chromium_src-0ce75f3e80c878ddda048ffdcd4360c3c12fb5d9.tar.bz2 | |
Fixed menu icon position to be centered between a gutter and left menu border.
BUG=156883
Review URL: https://chromiumcodereview.appspot.com/11230032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163426 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/controls/menu/menu_item_view.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc index 95a9875..98df77b8 100644 --- a/ui/views/controls/menu/menu_item_view.cc +++ b/ui/views/controls/menu/menu_item_view.cc @@ -602,14 +602,17 @@ void MenuItemView::UpdateMenuPartSizes() { if (has_icons_) icon_area_width_ = std::max(icon_area_width_, GetMaxIconViewWidth()); + label_start_ = config.item_left_margin + icon_area_width_; + int padding = 0; if (config.always_use_icon_to_label_padding) - label_start_ = config.item_left_margin + icon_area_width_ + - config.icon_to_label_padding; + padding = config.icon_to_label_padding; + else if (config.render_gutter) + padding = config.item_left_margin; else // If there are no icons don't pad by the icon to label padding. This // makes us look close to system menus. - label_start_ = config.item_left_margin + icon_area_width_ + - (has_icons_ ? config.icon_to_label_padding : 0); + padding = has_icons_ ? config.icon_to_label_padding : 0; + label_start_ += padding; if (config.render_gutter) label_start_ += config.gutter_width + config.gutter_to_label; |