ui/gfx/font.cc - Issue 14348033: NOT FOR SUBMIT - Windows Views HiDPI

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/gfx/font.cc

Issue 14348033: NOT FOR SUBMIT - Windows Views HiDPI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Revert spurious changes, plus some corrections. Created 7 years, 7 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/gfx/font.cc

diff --git a/ui/gfx/font.cc b/ui/gfx/font.cc

index 424d5852d53ca2574fe3a289e8364d6d9889e96a..c96babefc3b49549b07173bc8e021bfdb4379186 100644

--- a/ui/gfx/font.cc

+++ b/ui/gfx/font.cc

@@ -42,6 +42,10 @@ Font Font::DeriveFont(int size_delta) const {

return DeriveFont(size_delta, GetStyle());

}

+Font Font::DeriveFontScaled(float size_scale) const {

+ return DeriveFont(static_cast<int>((size_scale-1.0)*GetFontSize()));

Font Font::DeriveFont(int size_delta, int style) const {

return platform_font_->DeriveFont(size_delta, style);

}

« no previous file with comments | « ui/gfx/font.h ('k') | ui/gfx/rect_conversions.h » ('j') | no next file with comments »