diff options
| author | jennyz@google.com <jennyz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 16:29:03 +0000 |
|---|---|---|
| committer | jennyz@google.com <jennyz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 16:29:03 +0000 |
| commit | 932293db99d9fd95e3d403f907b1dcf05002d1d9 (patch) | |
| tree | 30d3e751f39e2ad2e6693d4b76a963c1cc037f43 /ui/gfx/native_theme_aura.cc | |
| parent | 5066298a3d224e3daca4501aaf1a69d3cb90b689 (diff) | |
| download | chromium_src-932293db99d9fd95e3d403f907b1dcf05002d1d9.zip chromium_src-932293db99d9fd95e3d403f907b1dcf05002d1d9.tar.gz chromium_src-932293db99d9fd95e3d403f907b1dcf05002d1d9.tar.bz2 | |
Implement part of aura menu spec described in:
http://www.corp.google.com/~kenmoore/mocks/chromeos/Misc_2012/Menus/markup1/menu4.html
The following are implemented:
min distance between item and shortcut: 20px
divider 1px solid color #dadada
2px above/below divider
20px right margin: between arrow/shortcut to right edge of menu
28 px left margin: between label and left edge of menu, with or without icon
icon/checkmarks: 8 px left margin.
submenu: overlap 3 px horizotally, this include the edge of the submenu and parent menu border, which are 1 px each.
submenu arrow: 20px right margin.
BUG=122858
TEST=Aura menu UI changes conform to aura menu spec as described above.
Review URL: https://chromiumcodereview.appspot.com/10387014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/native_theme_aura.cc')
| -rw-r--r-- | ui/gfx/native_theme_aura.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/gfx/native_theme_aura.cc b/ui/gfx/native_theme_aura.cc index 51683513..978c52d 100644 --- a/ui/gfx/native_theme_aura.cc +++ b/ui/gfx/native_theme_aura.cc @@ -32,6 +32,7 @@ const SkColor kTextButtonHoverColor = kTextButtonEnabledColor; const SkColor kEnabledMenuItemForegroundColor = kTextButtonEnabledColor; const SkColor kDisabledMenuItemForegroundColor = kTextButtonDisabledColor; const SkColor kFocusedMenuItemBackgroundColor = SkColorSetRGB(0xF1, 0xF1, 0xF1); +const SkColor kMenuSeparatorColor = SkColorSetRGB(0xDA, 0xDA, 0xDA); // Label: const SkColor kLabelEnabledColor = kTextButtonEnabledColor; const SkColor kLabelDisabledColor = kTextButtonDisabledColor; @@ -102,6 +103,8 @@ SkColor NativeThemeAura::GetSystemColor(ColorId color_id) const { return kDisabledMenuItemForegroundColor; case kColorId_FocusedMenuItemBackgroundColor: return kFocusedMenuItemBackgroundColor; + case kColorId_MenuSeparatorColor: + return kMenuSeparatorColor; // Label case kColorId_LabelEnabledColor: |