| OLD | NEW |
|---|
| 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/views/controls/menu/menu_config.h" | 5 #include "ui/views/controls/menu/menu_config.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "ui/base/layout.h" | |
| 9 #include "ui/native_theme/native_theme.h" | |
| 10 | 8 |
| 11 namespace views { | 9 namespace views { |
| 12 | 10 |
| 13 MenuConfig::MenuConfig(const ui::NativeTheme* theme) | 11 MenuConfig::MenuConfig(const ui::NativeTheme* theme) |
| 14 : arrow_color(SK_ColorBLACK), | 12 : arrow_color(SK_ColorBLACK), |
| 15 menu_vertical_border_size(3), | 13 menu_vertical_border_size(3), |
| 16 menu_horizontal_border_size(0), | 14 menu_horizontal_border_size(0), |
| 17 submenu_horizontal_inset(3), | 15 submenu_horizontal_inset(3), |
| 18 item_top_margin(4), | 16 item_top_margin(4), |
| 19 item_bottom_margin(3), | 17 item_bottom_margin(3), |
| (...skipping 18 matching lines...) Expand all Loading... |
| 38 scroll_arrow_height(3), | 36 scroll_arrow_height(3), |
| 39 label_to_minor_text_padding(10), | 37 label_to_minor_text_padding(10), |
| 40 item_min_height(0), | 38 item_min_height(0), |
| 41 show_accelerators(true), | 39 show_accelerators(true), |
| 42 always_use_icon_to_label_padding(false), | 40 always_use_icon_to_label_padding(false), |
| 43 align_arrow_and_shortcut(false), | 41 align_arrow_and_shortcut(false), |
| 44 offset_context_menus(false), | 42 offset_context_menus(false), |
| 45 native_theme(theme), | 43 native_theme(theme), |
| 46 show_delay(400), | 44 show_delay(400), |
| 47 corner_radius(0) { | 45 corner_radius(0) { |
| 48 // Use 40px tall menu items when running in touch optimized mode. | |
| 49 // For Windows use 40px tall menu items when running in touch optimized mode. | |
| 50 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { | |
| 51 item_top_margin = item_no_icon_top_margin = 12; | |
| 52 item_bottom_margin = item_no_icon_bottom_margin = 13; | |
| 53 } | |
| 54 Init(theme); | 46 Init(theme); |
| 55 } | 47 } |
| 56 | 48 |
| 57 MenuConfig::~MenuConfig() {} | 49 MenuConfig::~MenuConfig() {} |
| 58 | 50 |
| 59 } // namespace views | 51 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
