diff options
| author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 23:35:27 +0000 |
|---|---|---|
| committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 23:35:27 +0000 |
| commit | c263c7b37431c7ecd7f1a3366f0be94e6a3e3ad2 (patch) | |
| tree | 1dbf51e833e3e33f9e2b3dcacd88f78105ffba7e /ui | |
| parent | 5e9d8461f920ce2376f65d3df2c65f4f54c9923e (diff) | |
| download | chromium_src-c263c7b37431c7ecd7f1a3366f0be94e6a3e3ad2.zip chromium_src-c263c7b37431c7ecd7f1a3366f0be94e6a3e3ad2.tar.gz chromium_src-c263c7b37431c7ecd7f1a3366f0be94e6a3e3ad2.tar.bz2 | |
Fixed spacing issues for the wrench menu
BUG=137345
TEST=visual check
Review URL: https://chromiumcodereview.appspot.com/10887013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/controls/menu/menu_config_views.cc | 3 | ||||
| -rw-r--r-- | ui/views/controls/menu/menu_separator_views.cc | 18 |
2 files changed, 15 insertions, 6 deletions
diff --git a/ui/views/controls/menu/menu_config_views.cc b/ui/views/controls/menu/menu_config_views.cc index e369c956..cc44141 100644 --- a/ui/views/controls/menu/menu_config_views.cc +++ b/ui/views/controls/menu/menu_config_views.cc @@ -32,6 +32,9 @@ MenuConfig* MenuConfig::Create() { config->item_left_margin = 4; config->item_min_height = 29; config->separator_height = 15; + config->separator_spacing_height = 7; + config->separator_lower_height = 8; + config->separator_upper_height = 8; config->font = rb.GetFont(ResourceBundle::BaseFont); config->label_to_arrow_padding = 20; config->label_to_accelerator_padding = 20; diff --git a/ui/views/controls/menu/menu_separator_views.cc b/ui/views/controls/menu/menu_separator_views.cc index 4d267df..b3e69d6 100644 --- a/ui/views/controls/menu/menu_separator_views.cc +++ b/ui/views/controls/menu/menu_separator_views.cc @@ -19,12 +19,18 @@ namespace views { void MenuSeparator::OnPaint(gfx::Canvas* canvas) { int pos = 0; - if (type_ == ui::LOWER_SEPARATOR) - pos = height() - kSeparatorHeight; - else if (type_ != ui::SPACING_SEPARATOR) - pos = height() / 2; - else if (type_ != ui::UPPER_SEPARATOR) - return; + switch (type_) { + case ui::LOWER_SEPARATOR: + pos = height() - kSeparatorHeight; + break; + case ui::SPACING_SEPARATOR: + return; + case ui::UPPER_SEPARATOR: + break; + default: + pos = height() / 2; + break; + } canvas->FillRect(gfx::Rect(0, pos, width(), kSeparatorHeight), ui::NativeTheme::instance()->GetSystemColor( ui::NativeTheme::kColorId_MenuSeparatorColor)); |