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

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

Issue 2070623003: [MacViews] Show combobox menu popup at mouse press (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test Created 4 years, 5 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
« no previous file with comments | « ui/views/style/platform_style.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/paint_vector_icon.h" 9 #include "ui/gfx/paint_vector_icon.h"
10 #include "ui/gfx/vector_icons.h" 10 #include "ui/gfx/vector_icons.h"
11 #include "ui/resources/grit/ui_resources.h" 11 #include "ui/resources/grit/ui_resources.h"
12 #include "ui/views/controls/button/label_button.h" 12 #include "ui/views/controls/button/label_button.h"
13 #include "ui/views/controls/button/label_button_border.h" 13 #include "ui/views/controls/button/label_button_border.h"
14 #include "ui/views/controls/focusable_rounded_border_mac.h" 14 #include "ui/views/controls/focusable_rounded_border_mac.h"
15 #import "ui/views/controls/scrollbar/cocoa_scroll_bar.h" 15 #import "ui/views/controls/scrollbar/cocoa_scroll_bar.h"
16 #include "ui/views/style/mac/combobox_background_mac.h" 16 #include "ui/views/style/mac/combobox_background_mac.h"
17 #include "ui/views/style/mac/dialog_button_border_mac.h" 17 #include "ui/views/style/mac/dialog_button_border_mac.h"
18 18
19 namespace views { 19 namespace views {
20 20
21 const int PlatformStyle::kComboboxNormalArrowPadding = 0; 21 const int PlatformStyle::kComboboxNormalArrowPadding = 0;
22 const int PlatformStyle::kMinLabelButtonWidth = 32; 22 const int PlatformStyle::kMinLabelButtonWidth = 32;
23 const int PlatformStyle::kMinLabelButtonHeight = 30; 23 const int PlatformStyle::kMinLabelButtonHeight = 30;
24 const bool PlatformStyle::kDefaultLabelButtonHasBoldFont = false; 24 const bool PlatformStyle::kDefaultLabelButtonHasBoldFont = false;
25 const bool PlatformStyle::kTextfieldDragVerticallyDragsToEnd = true; 25 const bool PlatformStyle::kTextfieldDragVerticallyDragsToEnd = true;
26 26
27 const CustomButton::NotifyAction PlatformStyle::kMenuNotifyActivationAction =
28 CustomButton::NOTIFY_ON_PRESS;
29
27 // static 30 // static
28 gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled, 31 gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled,
29 Combobox::Style style) { 32 Combobox::Style style) {
30 // TODO(ellyjones): IDR_MENU_DROPARROW is a cross-platform image that doesn't 33 // TODO(ellyjones): IDR_MENU_DROPARROW is a cross-platform image that doesn't
31 // look right on Mac. See https://crbug.com/384071. 34 // look right on Mac. See https://crbug.com/384071.
32 if (style == Combobox::STYLE_ACTION) { 35 if (style == Combobox::STYLE_ACTION) {
33 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 36 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
34 return *rb.GetImageSkiaNamed(IDR_MENU_DROPARROW); 37 return *rb.GetImageSkiaNamed(IDR_MENU_DROPARROW);
35 } 38 }
36 const int kComboboxArrowWidth = 24; 39 const int kComboboxArrowWidth = 24;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 void PlatformStyle::ApplyLabelButtonTextStyle( 86 void PlatformStyle::ApplyLabelButtonTextStyle(
84 views::Label* label, 87 views::Label* label,
85 ButtonColorByState* color_by_state) { 88 ButtonColorByState* color_by_state) {
86 const ui::NativeTheme* theme = label->GetNativeTheme(); 89 const ui::NativeTheme* theme = label->GetNativeTheme();
87 ButtonColorByState& colors = *color_by_state; 90 ButtonColorByState& colors = *color_by_state;
88 colors[Button::STATE_PRESSED] = 91 colors[Button::STATE_PRESSED] =
89 theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonHighlightColor); 92 theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonHighlightColor);
90 } 93 }
91 94
92 } // namespace views 95 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/style/platform_style.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698