ui/views/controls/menu/menu_item_view.cc - Issue 24883002: Uses and returns the fractional width in text eliding

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 24883002: Uses and returns the fractional width in text eliding (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix win bots Created 7 years, 3 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:

Index: ui/views/controls/menu/menu_item_view.cc

diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc

index 040cd898616e2c8993299abe6b005721ad1391e7..dc6f9c005ab42e7c52246f978bc9c9e9bddebde1 100644

--- a/ui/views/controls/menu/menu_item_view.cc

+++ b/ui/views/controls/menu/menu_item_view.cc

@@ -1032,7 +1032,7 @@ MenuItemView::MenuItemDimensions MenuItemView::CalculateDimensions() {

int string_width = font.GetStringWidth(title_);

if (!subtitle_.empty())

- string_width = std::max(string_width, font.GetStringWidth(subtitle_));

+ string_width = std::max<int>(string_width, font.GetStringWidth(subtitle_));

dimensions.standard_width = string_width + label_start +

item_right_margin_;