ui/views/controls/button/text_button.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/button/text_button.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/controls/button/text_button.cc

diff --git a/ui/views/controls/button/text_button.cc b/ui/views/controls/button/text_button.cc

index 38e9691b19aafe85fc0020b9f0ac12a24d114e39..66ac9caf3a71db3b8bbc8bac0cc5787ffac75b88 100644

--- a/ui/views/controls/button/text_button.cc

+++ b/ui/views/controls/button/text_button.cc

@@ -374,8 +374,8 @@ void TextButtonBase::UpdateTextSize() {

}

void TextButtonBase::CalculateTextSize(gfx::Size* text_size, int max_width) {

- int h = font_.GetHeight();

- int w = multi_line_ ? max_width : 0;

+ float h = font_.GetHeight();

+ float w = multi_line_ ? max_width : 0;

int flags = ComputeCanvasStringFlags();

if (!multi_line_)

flags |= gfx::Canvas::NO_ELLIPSIS;