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

Side by Side Diff: ui/views/style/platform_style_mac.mm

Issue 2270933002: Harmony: disable ripples on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use pressed color for buttons on mac Created 4 years, 3 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 "ui/views/style/platform_style.h" 5 #include "ui/views/style/platform_style.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "ui/base/resource/resource_bundle.h" 8 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/gfx/color_utils.h"
9 #include "ui/gfx/paint_vector_icon.h" 10 #include "ui/gfx/paint_vector_icon.h"
10 #include "ui/gfx/vector_icons.h" 11 #include "ui/gfx/vector_icons.h"
11 #include "ui/resources/grit/ui_resources.h" 12 #include "ui/resources/grit/ui_resources.h"
12 #include "ui/views/controls/button/label_button.h" 13 #include "ui/views/controls/button/label_button.h"
13 #include "ui/views/controls/button/label_button_border.h" 14 #include "ui/views/controls/button/label_button_border.h"
14 #include "ui/views/controls/focusable_rounded_border_mac.h" 15 #include "ui/views/controls/focusable_rounded_border_mac.h"
15 #import "ui/views/controls/scrollbar/cocoa_scroll_bar.h" 16 #import "ui/views/controls/scrollbar/cocoa_scroll_bar.h"
16 #include "ui/views/style/mac/combobox_background_mac.h" 17 #include "ui/views/style/mac/combobox_background_mac.h"
17 #include "ui/views/style/mac/dialog_button_border_mac.h" 18 #include "ui/views/style/mac/dialog_button_border_mac.h"
18 19
19 namespace views { 20 namespace views {
20 21
21 const int PlatformStyle::kComboboxNormalArrowPadding = 0; 22 const int PlatformStyle::kComboboxNormalArrowPadding = 0;
22 const int PlatformStyle::kMinLabelButtonWidth = 32; 23 const int PlatformStyle::kMinLabelButtonWidth = 32;
23 const int PlatformStyle::kMinLabelButtonHeight = 30; 24 const int PlatformStyle::kMinLabelButtonHeight = 30;
24 const bool PlatformStyle::kDefaultLabelButtonHasBoldFont = false; 25 const bool PlatformStyle::kDefaultLabelButtonHasBoldFont = false;
25 const bool PlatformStyle::kDialogDefaultButtonCanBeCancel = false; 26 const bool PlatformStyle::kDialogDefaultButtonCanBeCancel = false;
26 const bool PlatformStyle::kTextfieldDragVerticallyDragsToEnd = true; 27 const bool PlatformStyle::kTextfieldDragVerticallyDragsToEnd = true;
27 const bool PlatformStyle::kTreeViewSelectionPaintsEntireRow = true; 28 const bool PlatformStyle::kTreeViewSelectionPaintsEntireRow = true;
29 const bool PlatformStyle::kUseRipples = false;
28 30
29 const CustomButton::NotifyAction PlatformStyle::kMenuNotifyActivationAction = 31 const CustomButton::NotifyAction PlatformStyle::kMenuNotifyActivationAction =
30 CustomButton::NOTIFY_ON_PRESS; 32 CustomButton::NOTIFY_ON_PRESS;
31 33
32 // static 34 // static
33 gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled, 35 gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled,
34 Combobox::Style style) { 36 Combobox::Style style) {
35 // TODO(ellyjones): IDR_MENU_DROPARROW is a cross-platform image that doesn't 37 // TODO(ellyjones): IDR_MENU_DROPARROW is a cross-platform image that doesn't
36 // look right on Mac. See https://crbug.com/384071. 38 // look right on Mac. See https://crbug.com/384071.
37 if (style == Combobox::STYLE_ACTION) { 39 if (style == Combobox::STYLE_ACTION) {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // static 89 // static
88 void PlatformStyle::ApplyLabelButtonTextStyle( 90 void PlatformStyle::ApplyLabelButtonTextStyle(
89 views::Label* label, 91 views::Label* label,
90 ButtonColorByState* color_by_state) { 92 ButtonColorByState* color_by_state) {
91 const ui::NativeTheme* theme = label->GetNativeTheme(); 93 const ui::NativeTheme* theme = label->GetNativeTheme();
92 ButtonColorByState& colors = *color_by_state; 94 ButtonColorByState& colors = *color_by_state;
93 colors[Button::STATE_PRESSED] = 95 colors[Button::STATE_PRESSED] =
94 theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonHighlightColor); 96 theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonHighlightColor);
95 } 97 }
96 98
99 // static
100 SkColor PlatformStyle::BackgroundColorForMdButton(
101 SkColor color,
102 Button::ButtonState state) {
103 // Per Harmony specs: Pressed state on Mac is + #000 at 0.05 alpha.
104 if (state == Button::STATE_PRESSED)
105 return color_utils::AlphaBlend(SK_ColorBLACK, color, 0x08);
106 return color;
107 }
108
97 } // namespace views 109 } // namespace views
OLDNEW
« ui/views/style/platform_style.h ('K') | « ui/views/style/platform_style.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698