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 "grit/ui_resources.h" | 7 #include "grit/ui_resources.h" |
8 #include "ui/base/layout.h" | 8 #include "ui/base/layout.h" |
9 #include "ui/base/native_theme/native_theme_aura.h" | 9 #include "ui/base/native_theme/native_theme_aura.h" |
10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 // padding to implement full-height buttons. | 36 // padding to implement full-height buttons. |
37 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) | 37 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) |
38 config->separator_height = 1; | 38 config->separator_height = 1; |
39 else | 39 else |
40 config->separator_height = 15; | 40 config->separator_height = 15; |
41 config->font = rb.GetFont(ResourceBundle::BaseFont); | 41 config->font = rb.GetFont(ResourceBundle::BaseFont); |
42 config->label_to_arrow_padding = 20; | 42 config->label_to_arrow_padding = 20; |
43 config->label_to_accelerator_padding = 20; | 43 config->label_to_accelerator_padding = 20; |
44 config->always_use_icon_to_label_padding = true; | 44 config->always_use_icon_to_label_padding = true; |
45 config->align_arrow_and_shortcut = true; | 45 config->align_arrow_and_shortcut = true; |
| 46 config->offset_context_menus = true; |
46 | 47 |
47 return config; | 48 return config; |
48 } | 49 } |
49 | 50 |
50 } // namespace views | 51 } // namespace views |
OLD | NEW |