Commit 65ecf031 authored by Qiang Xu's avatar Qiang Xu Committed by Commit Bot

cros: 14px font size for touchable menus

Bug: 846890
Test: manual
Change-Id: I37b4a89130d282a497058485bcd1c24fd87b326d
Reviewed-on: https://chromium-review.googlesource.com/1074224Reviewed-by: default avatarMichael Wasserman <msw@chromium.org>
Commit-Queue: Qiang Xu <warx@google.com>
Cr-Commit-Position: refs/heads/master@{#563041}
parent 41fba922
......@@ -845,6 +845,9 @@ const gfx::FontList& MenuItemView::GetFontList() const {
if (font_list)
return *font_list;
}
if (GetMenuController() && GetMenuController()->use_touchable_layout())
return style::GetFont(style::CONTEXT_TOUCH_MENU, style::STYLE_PRIMARY);
return MenuConfig::instance().font_list;
}
......
......@@ -115,7 +115,7 @@ void DefaultTypographyProvider::GetDefaultFont(int context,
*size_delta = ui::kTitleFontSizeDelta;
break;
case style::CONTEXT_TOUCH_MENU:
*size_delta = -1;
*size_delta = 2;
break;
default:
*size_delta = ui::kLabelFontSizeDelta;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment