ui/views/widget/tooltip_manager.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/widget/tooltip_manager.cc

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

Patch Set: Patch 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/widget/tooltip_manager.cc

diff --git a/ui/views/widget/tooltip_manager.cc b/ui/views/widget/tooltip_manager.cc

index 7eb497876414050988535664288c09c614c058fa..f34bbe4fe2d0528b54e49cc75d315b7113745eca 100644

--- a/ui/views/widget/tooltip_manager.cc

+++ b/ui/views/widget/tooltip_manager.cc

@@ -52,8 +52,9 @@ void TooltipManager::TrimTooltipToFit(string16* text,

++i) {

string16 elided_text =

gfx::ElideText(*i, font_list, available_width, gfx::ELIDE_AT_END);

- *max_width = std::max(*max_width,

- gfx::GetStringWidth(elided_text, font_list));

+ *max_width = std::max(

+ *max_width,

+ static_cast<int>(gfx::GetStringWidth(elided_text, font_list)));

msw 2013/09/27 21:54:48 Use std::max<int> instead (or float if that's more

jianli 2013/10/01 00:32:58 Done.

if (!result.empty())

result.push_back('\n');

result.append(elided_text);

« ui/views/controls/label.cc ('K') | « ui/views/controls/tree/tree_view.cc ('k') | no next file » | no next file with comments »