Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(341)

Side by Side Diff: chrome/browser/ui/views/bar_control_button.cc

Issue 1682893002: Color the ink drop ripple and hover effects based on theming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unit tests Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/bar_control_button.h" 5 #include "chrome/browser/ui/views/bar_control_button.h"
6 6
7 #include "ui/gfx/color_utils.h" 7 #include "ui/gfx/color_utils.h"
8 #include "ui/gfx/paint_vector_icon.h" 8 #include "ui/gfx/paint_vector_icon.h"
9 #include "ui/gfx/vector_icons_public.h" 9 #include "ui/gfx/vector_icons_public.h"
10 #include "ui/views/animation/button_ink_drop_delegate.h" 10 #include "ui/views/animation/button_ink_drop_delegate.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 views::ImageButton::ALIGN_MIDDLE); 48 views::ImageButton::ALIGN_MIDDLE);
49 } 49 }
50 50
51 void BarControlButton::OnThemeChanged() { 51 void BarControlButton::OnThemeChanged() {
52 SkColor icon_color = 52 SkColor icon_color =
53 color_utils::DeriveDefaultIconColor(get_text_color_callback_.Run()); 53 color_utils::DeriveDefaultIconColor(get_text_color_callback_.Run());
54 gfx::ImageSkia image = gfx::CreateVectorIcon(id_, 16, icon_color); 54 gfx::ImageSkia image = gfx::CreateVectorIcon(id_, 16, icon_color);
55 SetImage(views::CustomButton::STATE_NORMAL, &image); 55 SetImage(views::CustomButton::STATE_NORMAL, &image);
56 image = gfx::CreateVectorIcon(id_, 16, SkColorSetA(icon_color, 0xff / 2)); 56 image = gfx::CreateVectorIcon(id_, 16, SkColorSetA(icon_color, 0xff / 2));
57 SetImage(views::CustomButton::STATE_DISABLED, &image); 57 SetImage(views::CustomButton::STATE_DISABLED, &image);
58 set_ink_drop_base_color(icon_color);
bruthig 2016/02/09 21:01:06 Shouldn't some of the other Views use a similar pa
Evan Stade 2016/02/09 22:54:28 like which one?
bruthig 2016/02/10 15:09:54 Nevermind, I follow now.
58 } 59 }
59 60
60 void BarControlButton::OnNativeThemeChanged(const ui::NativeTheme* theme) { 61 void BarControlButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
61 OnThemeChanged(); 62 OnThemeChanged();
62 } 63 }
63 64
64 bool BarControlButton::OnMousePressed(const ui::MouseEvent& event) { 65 bool BarControlButton::OnMousePressed(const ui::MouseEvent& event) {
65 if (IsTriggerableEvent(event)) 66 if (IsTriggerableEvent(event))
66 ink_drop_delegate()->OnAction(views::InkDropState::ACTION_PENDING); 67 ink_drop_delegate()->OnAction(views::InkDropState::ACTION_PENDING);
67 68
68 return ImageButton::OnMousePressed(event); 69 return ImageButton::OnMousePressed(event);
69 } 70 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698