ui/views/controls/label.cc - Issue 142523003: Renames gfx::FontList::Derive* family.

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 142523003: Renames gfx::FontList::Derive* family. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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/label.cc

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

index 0a7362d41d6c15a9d016915967e3a25ef495971c..11409b4adf389f16edac2dbe57ee42b71366445c 100644

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

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

@@ -216,7 +216,8 @@ gfx::Size Label::GetMinimumSize() {

if ((!visible() && collapse_when_hidden_) || text_size.IsEmpty())

return gfx::Size();

- gfx::Size size(font_list_.GetStringWidth(base::string16(gfx::kEllipsisUTF16)),

+ gfx::Size size(gfx::GetStringWidth(base::string16(gfx::kEllipsisUTF16),

+ font_list_),

font_list_.GetHeight());

size.SetToMin(text_size); // The actual text may be shorter than an ellipsis.

gfx::Insets insets = GetInsets();

« ui/gfx/font_list.cc ('K') | « ui/gfx/render_text_pango.cc ('k') | no next file » | no next file with comments »