summaryrefslogtreecommitdiffstats
path: root/ui/views
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-08 03:52:25 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-08 03:52:25 +0000
commite0f045b4f1151f2441434d7bf9f19c9af6e8c4a4 (patch)
treea92fac858240f5f2e9dbc471e5fe0c057aa10a39 /ui/views
parent5ebf59f79544ece53dd2a2dee69f99a805567e2e (diff)
downloadchromium_src-e0f045b4f1151f2441434d7bf9f19c9af6e8c4a4.zip
chromium_src-e0f045b4f1151f2441434d7bf9f19c9af6e8c4a4.tar.gz
chromium_src-e0f045b4f1151f2441434d7bf9f19c9af6e8c4a4.tar.bz2
fix views submenu arrow painting
make the color (light/dark) match the actual highlight state BUG=351670 Review URL: https://codereview.chromium.org/213863002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
-rw-r--r--ui/views/controls/menu/menu_item_view.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc
index 33c5e44..5f237c5 100644
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -770,7 +770,7 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
// Render the check.
if (type_ == CHECKBOX && delegate->IsItemChecked(GetCommand())) {
- gfx::ImageSkia check = GetMenuCheckImage(IsSelected());
+ gfx::ImageSkia check = GetMenuCheckImage(render_selection);
// Don't use config.check_width here as it's padded
// to force more padding (AURA).
gfx::Rect check_bounds(icon_x,
@@ -842,7 +842,7 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
// Render the submenu indicator (arrow).
if (HasSubmenu()) {
- gfx::ImageSkia arrow = GetSubmenuArrowImage(IsSelected());
+ gfx::ImageSkia arrow = GetSubmenuArrowImage(render_selection);
gfx::Rect arrow_bounds(this->width() - config.arrow_width -
config.arrow_to_edge_padding,
top_margin + (available_height - arrow.height()) / 2,