| 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" | 8 #include "ui/base/layout.h" |
| 9 | 9 |
| 10 namespace views { | 10 namespace views { |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 icon_to_label_padding(8), | 26 icon_to_label_padding(8), |
| 27 gutter_to_label(5), | 27 gutter_to_label(5), |
| 28 check_width(16), | 28 check_width(16), |
| 29 check_height(16), | 29 check_height(16), |
| 30 radio_width(16), | 30 radio_width(16), |
| 31 radio_height(16), | 31 radio_height(16), |
| 32 arrow_height(9), | 32 arrow_height(9), |
| 33 arrow_width(9), | 33 arrow_width(9), |
| 34 gutter_width(0), | 34 gutter_width(0), |
| 35 separator_height(6), | 35 separator_height(6), |
| 36 separator_upper_height(3), |
| 37 separator_lower_height(4), |
| 38 separator_spacing_height(3), |
| 36 render_gutter(false), | 39 render_gutter(false), |
| 37 show_mnemonics(false), | 40 show_mnemonics(false), |
| 38 scroll_arrow_height(3), | 41 scroll_arrow_height(3), |
| 39 label_to_accelerator_padding(10), | 42 label_to_accelerator_padding(10), |
| 40 item_min_height(0), | 43 item_min_height(0), |
| 41 show_accelerators(true), | 44 show_accelerators(true), |
| 42 always_use_icon_to_label_padding(false), | 45 always_use_icon_to_label_padding(false), |
| 43 align_arrow_and_shortcut(false), | 46 align_arrow_and_shortcut(false), |
| 44 offset_context_menus(false) { | 47 offset_context_menus(false) { |
| 45 // Use 40px tall menu items when running in touch optimized mode. | 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. |
| 46 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { | 50 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { |
| 47 item_top_margin = item_no_icon_top_margin = 12; | 51 item_top_margin = item_no_icon_top_margin = 12; |
| 48 item_bottom_margin = item_no_icon_bottom_margin = 13; | 52 item_bottom_margin = item_no_icon_bottom_margin = 13; |
| 49 } | 53 } |
| 50 } | 54 } |
| 51 | 55 |
| 52 MenuConfig::~MenuConfig() {} | 56 MenuConfig::~MenuConfig() {} |
| 53 | 57 |
| 54 void MenuConfig::Reset() { | 58 void MenuConfig::Reset() { |
| 55 delete config_instance; | 59 delete config_instance; |
| 56 config_instance = NULL; | 60 config_instance = NULL; |
| 57 } | 61 } |
| 58 | 62 |
| 59 // static | 63 // static |
| 60 const MenuConfig& MenuConfig::instance() { | 64 const MenuConfig& MenuConfig::instance() { |
| 61 if (!config_instance) | 65 if (!config_instance) |
| 62 config_instance = Create(); | 66 config_instance = Create(); |
| 63 return *config_instance; | 67 return *config_instance; |
| 64 } | 68 } |
| 65 | 69 |
| 66 } // namespace views | 70 } // namespace views |
| OLD | NEW |