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

Side by Side Diff: ui/native_theme/native_theme_base.cc

Issue 1661673004: Enables hot-tracking for overflow extension buttons in the app menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restores hot-tracking of extension buttons in app menu with MD (nit) 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/native_theme/native_theme_base.h" 5 #include "ui/native_theme/native_theme_base.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 case kInnerSpinButton: 206 case kInnerSpinButton:
207 PaintInnerSpinButton(canvas, state, rect, extra.inner_spin); 207 PaintInnerSpinButton(canvas, state, rect, extra.inner_spin);
208 break; 208 break;
209 case kMenuList: 209 case kMenuList:
210 PaintMenuList(canvas, state, rect, extra.menu_list); 210 PaintMenuList(canvas, state, rect, extra.menu_list);
211 break; 211 break;
212 case kMenuPopupBackground: 212 case kMenuPopupBackground:
213 PaintMenuPopupBackground(canvas, rect.size(), extra.menu_background); 213 PaintMenuPopupBackground(canvas, rect.size(), extra.menu_background);
214 break; 214 break;
215 case kMenuItemBackground: 215 case kMenuItemBackground:
216 PaintMenuItemBackground(canvas, state, rect, extra.menu_list); 216 PaintMenuItemBackground(canvas, state, rect, extra.menu_item);
217 break; 217 break;
218 case kProgressBar: 218 case kProgressBar:
219 PaintProgressBar(canvas, state, rect, extra.progress_bar); 219 PaintProgressBar(canvas, state, rect, extra.progress_bar);
220 break; 220 break;
221 case kPushButton: 221 case kPushButton:
222 PaintButton(canvas, state, rect, extra.button); 222 PaintButton(canvas, state, rect, extra.button);
223 break; 223 break;
224 case kRadio: 224 case kRadio:
225 PaintRadio(canvas, state, rect, extra.button); 225 PaintRadio(canvas, state, rect, extra.button);
226 break; 226 break;
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 SkCanvas* canvas, 785 SkCanvas* canvas,
786 const gfx::Size& size, 786 const gfx::Size& size,
787 const MenuBackgroundExtraParams& menu_background) const { 787 const MenuBackgroundExtraParams& menu_background) const {
788 canvas->drawColor(kMenuPopupBackgroundColor, SkXfermode::kSrc_Mode); 788 canvas->drawColor(kMenuPopupBackgroundColor, SkXfermode::kSrc_Mode);
789 } 789 }
790 790
791 void NativeThemeBase::PaintMenuItemBackground( 791 void NativeThemeBase::PaintMenuItemBackground(
792 SkCanvas* canvas, 792 SkCanvas* canvas,
793 State state, 793 State state,
794 const gfx::Rect& rect, 794 const gfx::Rect& rect,
795 const MenuListExtraParams& menu_list) const { 795 const MenuItemExtraParams& menu_item) const {
796 // By default don't draw anything over the normal background. 796 // By default don't draw anything over the normal background.
797 } 797 }
798 798
799 void NativeThemeBase::PaintSliderTrack(SkCanvas* canvas, 799 void NativeThemeBase::PaintSliderTrack(SkCanvas* canvas,
800 State state, 800 State state,
801 const gfx::Rect& rect, 801 const gfx::Rect& rect,
802 const SliderExtraParams& slider) const { 802 const SliderExtraParams& slider) const {
803 const int kMidX = rect.x() + rect.width() / 2; 803 const int kMidX = rect.x() + rect.width() / 2;
804 const int kMidY = rect.y() + rect.height() / 2; 804 const int kMidY = rect.y() + rect.height() / 2;
805 805
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f); 1035 SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);
1036 SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f); 1036 SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
1037 1037
1038 if (hsv1[2] + hsv2[2] > 1.0) 1038 if (hsv1[2] + hsv2[2] > 1.0)
1039 diff = -diff; 1039 diff = -diff;
1040 1040
1041 return SaturateAndBrighten(hsv2, -0.2f, diff); 1041 return SaturateAndBrighten(hsv2, -0.2f, diff);
1042 } 1042 }
1043 1043
1044 } // namespace ui 1044 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698