ui/views/controls/label.cc - Issue 960203004: tracing for RenderTextMac::GetDisplayText() eliding goo

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/label.cc

Issue 960203004: tracing for RenderTextMac::GetDisplayText() eliding goo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150129-MacViews-Bringup5-RTHB-in-Label

Patch Set: fix upstream Created 5 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

Index: ui/views/controls/label.cc

diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc

index 3792a49d1d2d9d1d57dbd79032a3b1e20a5a793a..eb752dbbfa9205c50f9f90daf2ae07e26ee82ce6 100644

--- a/ui/views/controls/label.cc

+++ b/ui/views/controls/label.cc

@@ -445,9 +445,10 @@ void Label::MaybeBuildRenderTextLines() {

(render_text_->MultilineSupported() && !allow_character_break_)) {

scoped_ptr<gfx::RenderText> render_text =

CreateRenderText(text(), alignment, directionality, elide_behavior);

- render_text->SetDisplayRect(rect);

render_text->SetMultiline(multi_line());

+ render_text->SetDisplayRect(rect);

lines_.push_back(render_text.release());

+ // lines_.back()->SetText(lines_[0]->GetDisplayText());

} else {

std::vector<base::string16> lines = GetLinesForWidth(rect.width());

if (lines.size() > 1)

« no previous file with comments | « ui/gfx/render_text_unittest.cc ('k') | no next file » | no next file with comments »