diff options
| author | jennyz@google.com <jennyz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 00:15:49 +0000 |
|---|---|---|
| committer | jennyz@google.com <jennyz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 00:15:49 +0000 |
| commit | 1e1799b31d9e7283aaf6f98769444163abc8d4bf (patch) | |
| tree | b2c9dd2525819f183c55065c11b9fe42ef73213d /ui | |
| parent | 07908ebca049d8cf91ef2777e4c77b30e0c93fb2 (diff) | |
| download | chromium_src-1e1799b31d9e7283aaf6f98769444163abc8d4bf.zip chromium_src-1e1799b31d9e7283aaf6f98769444163abc8d4bf.tar.gz chromium_src-1e1799b31d9e7283aaf6f98769444163abc8d4bf.tar.bz2 | |
Implement par of aura menu spec:
Disbled icon opacity: 0.5.
http://www.corp.google.com/~kenmoore/mocks/chromeos/Misc_2012/Menus/markup1/menu4.html
BUG=122858
TEST=Disabled menu item icon should look half opaque.
Review URL: https://chromiumcodereview.appspot.com/10310064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/controls/menu/menu_item_view_views.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ui/views/controls/menu/menu_item_view_views.cc b/ui/views/controls/menu/menu_item_view_views.cc index 0c6cc49..6942dc9 100644 --- a/ui/views/controls/menu/menu_item_view_views.cc +++ b/ui/views/controls/menu/menu_item_view_views.cc @@ -92,7 +92,13 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) { icon_.width(), icon_.height()); icon_bounds.set_x(GetMirroredXForRect(icon_bounds)); - canvas->DrawBitmapInt(icon_, icon_bounds.x(), icon_bounds.y()); + if (!enabled()) { + SkPaint paint; + paint.setAlpha(120); + canvas->DrawBitmapInt(icon_, icon_bounds.x(), icon_bounds.y(), paint); + } else { + canvas->DrawBitmapInt(icon_, icon_bounds.x(), icon_bounds.y()); + } } // Render the submenu indicator (arrow). |