Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(454)

Unified Diff: views/window/custom_frame_view.cc

Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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
« no previous file with comments | « views/widget/tooltip_manager_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/window/custom_frame_view.cc
===================================================================
--- views/window/custom_frame_view.cc (revision 55911)
+++ views/window/custom_frame_view.cc (working copy)
@@ -280,7 +280,7 @@
// size are increased.
return GetSystemMetrics(SM_CYSMICON);
#else
- return std::max(title_font_->height(), kIconMinimumSize);
+ return std::max(title_font_->GetHeight(), kIconMinimumSize);
#endif
}
@@ -541,7 +541,7 @@
// Size the title.
int title_x = d->ShouldShowWindowIcon() ?
icon_bounds.right() + kIconTitleSpacing : icon_bounds.x();
- int title_height = title_font_->height();
+ int title_height = title_font_->GetHeight();
// We bias the title position so that when the difference between the icon and
// title heights is odd, the extra pixel of the title is above the vertical
// midline rather than below. This compensates for how the icon is already
« no previous file with comments | « views/widget/tooltip_manager_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698