diff options
| author | yefim@chromium.org <yefim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 22:15:54 +0000 |
|---|---|---|
| committer | yefim@chromium.org <yefim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-05 22:15:54 +0000 |
| commit | 7bf378da717fdb08e26774e0b6e9532bdc5a6051 (patch) | |
| tree | 3cf611a572b408515b8401828bff4c74702da4a5 /ui | |
| parent | 84685520948dcbf750736faa3e2bcc9dc430e861 (diff) | |
| download | chromium_src-7bf378da717fdb08e26774e0b6e9532bdc5a6051.zip chromium_src-7bf378da717fdb08e26774e0b6e9532bdc5a6051.tar.gz chromium_src-7bf378da717fdb08e26774e0b6e9532bdc5a6051.tar.bz2 | |
Adjusted menu item height to meet requirements
BUG=173262
Review URL: https://chromiumcodereview.appspot.com/12184031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/controls/menu/menu_config.cc | 6 | ||||
| -rw-r--r-- | ui/views/controls/menu/menu_config_win.cc | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ui/views/controls/menu/menu_config.cc b/ui/views/controls/menu/menu_config.cc index 71dbc53..01e4546 100644 --- a/ui/views/controls/menu/menu_config.cc +++ b/ui/views/controls/menu/menu_config.cc @@ -61,8 +61,10 @@ MenuConfig::~MenuConfig() {} void MenuConfig::AdjustForCommonTheme() { render_gutter = false; - item_top_margin = 6; - item_bottom_margin = 6; + item_top_margin = 5; + item_bottom_margin = 5; + item_no_icon_top_margin = 7; + item_no_icon_bottom_margin = 7; separator_height = 15; menu_horizontal_border_size = 2; menu_vertical_border_size = 8; diff --git a/ui/views/controls/menu/menu_config_win.cc b/ui/views/controls/menu/menu_config_win.cc index 8dfc2c1..1899659 100644 --- a/ui/views/controls/menu/menu_config_win.cc +++ b/ui/views/controls/menu/menu_config_win.cc @@ -99,14 +99,14 @@ void MenuConfig::Init(const NativeTheme* theme) { separator_height = GetSystemMetrics(SM_CYMENU) / 2 - 1; } - if (NativeTheme::IsNewMenuStyleEnabled()) - AdjustForCommonTheme(); - // On Windows, having some menus use wider spacing than others looks wrong. // See http://crbug.com/88875 item_no_icon_bottom_margin = item_bottom_margin; item_no_icon_top_margin = item_top_margin; + if (NativeTheme::IsNewMenuStyleEnabled()) + AdjustForCommonTheme(); + BOOL show_cues; show_mnemonics = (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &show_cues, 0) && |