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

Unified Diff: ui/views/controls/menu/menu_scroll_view_container.cc

Issue 12217146: Fixing the double border around rounded menus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: After checking with designer: Cros should keep shadow - so we use the old shadow/border code there. Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_scroll_view_container.cc
diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc
index afb0d06981cf7affdb479b9697febcdfe8520a39..1cd7a048db96b43e49da82c47f86d53392bacf1a 100644
--- a/ui/views/controls/menu/menu_scroll_view_container.cc
+++ b/ui/views/controls/menu/menu_scroll_view_container.cc
@@ -270,8 +270,18 @@ void MenuScrollViewContainer::CreateDefaultBorder() {
const MenuConfig& menu_config =
content_view_->GetMenuItem()->GetMenuConfig();
+#if defined(OS_CHROMEOS)
sky 2013/02/13 00:06:53 This should be based on whether the NativeTheme is
Mr4D (OOO till 08-26) 2013/02/13 00:34:15 Okay, I looked at the NativeThemeAura as requested
+ // On ChromeOS the border gets drawn with the shadow. Furthermore no
+ // additional padding is wanted.
+ set_border(Border::CreateEmptyBorder(
+ menu_config.menu_vertical_border_size,
+ menu_config.menu_horizontal_border_size,
+ menu_config.menu_vertical_border_size,
+ menu_config.menu_horizontal_border_size));
+#else
int padding = menu_config.corner_radius > 0 ?
kBorderPaddingDueToRoundedCorners : 0;
+
int top = menu_config.menu_vertical_border_size + padding;
int left = menu_config.menu_horizontal_border_size + padding;
int bottom = menu_config.menu_vertical_border_size + padding;
@@ -286,6 +296,7 @@ void MenuScrollViewContainer::CreateDefaultBorder() {
} else {
set_border(Border::CreateEmptyBorder(top, left, bottom, right));
}
+#endif
}
void MenuScrollViewContainer::CreateBubbleBorder() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698