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

Side by Side Diff: ui/views/controls/menu/menu_config_views.cc

Issue 10829283: Adjust menu item sizes for touch / non-touch according to spec. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
OLDNEW
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 11 matching lines...) Expand all
22 config->submenu_vertical_margin_size = 2; 22 config->submenu_vertical_margin_size = 2;
23 config->submenu_horizontal_inset = 1; 23 config->submenu_horizontal_inset = 1;
24 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 24 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
25 config->arrow_to_edge_padding = 20; 25 config->arrow_to_edge_padding = 20;
26 config->icon_to_label_padding = 4; 26 config->icon_to_label_padding = 4;
27 config->arrow_width = rb.GetImageNamed(IDR_MENU_ARROW).ToImageSkia()->width(); 27 config->arrow_width = rb.GetImageNamed(IDR_MENU_ARROW).ToImageSkia()->width();
28 const gfx::ImageSkia* check = rb.GetImageNamed(IDR_MENU_CHECK).ToImageSkia(); 28 const gfx::ImageSkia* check = rb.GetImageNamed(IDR_MENU_CHECK).ToImageSkia();
29 // Add 4 to force some padding between check and label. 29 // Add 4 to force some padding between check and label.
30 config->check_width = check->width() + 4; 30 config->check_width = check->width() + 4;
31 config->check_height = check->height(); 31 config->check_height = check->height();
32 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { 32 config->item_left_margin = 4;
33 config->item_min_height = 29;
34 // TODO(skuhne): Separators in menus should have the same padding in touch
35 // mode but currently the touch wrench menu relies on separators having no
36 // padding to implement full-height buttons.
37 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH)
33 config->separator_height = 1; 38 config->separator_height = 1;
34 config->item_min_height = 40; 39 else
35 config->item_left_margin = 4; 40 config->separator_height = 15;
36 } else {
37 config->separator_height = 5;
38 config->item_min_height = 30;
39 config->item_left_margin = 8;
40 }
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 46
47 return config; 47 return config;
48 } 48 }
49 49
50 } // namespace views 50 } // namespace views
OLDNEW
« ui/views/controls/menu/menu_config.cc ('K') | « ui/views/controls/menu/menu_config.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698