ui/views/controls/label.cc - Issue 719483002: Merge to M-40 2214: Support vertical centering of multi-line labels.

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 719483002: Merge to M-40 2214: Support vertical centering of multi-line labels. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2214

Patch Set: Created 6 years, 1 month 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 1078d0b5a8a84e7ae22165cd2eb6e4a7065e6e4c..9d71a98bcbe4c25f5668d908465889ced72d2ed3 100644

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

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

@@ -437,7 +437,10 @@ gfx::Rect Label::GetTextBounds() const {

NOTREACHED();

break;

}

- text_size.set_height(available.height());

+ if (!multi_line_)

+ text_size.set_height(available.height());

+ // Support vertical centering of multi-line labels: http://crbug.com/429595

+ origin.Offset(0, std::max(0, (available.height() - text_size.height())) / 2);

return gfx::Rect(origin, text_size);

}

« no previous file with comments | « no previous file | ui/views/controls/label_unittest.cc » ('j') | no next file with comments »