summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-08 21:40:20 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-08 21:40:20 +0000
commit8d8cfc7019e50af96a40b12b3e707424334bb9b6 (patch)
tree746c85411556a89b14bb0d213c1a7894214807ca /app
parentc7f2b012a3b721d4776cba22081762606d192cca (diff)
downloadchromium_src-8d8cfc7019e50af96a40b12b3e707424334bb9b6.zip
chromium_src-8d8cfc7019e50af96a40b12b3e707424334bb9b6.tar.gz
chromium_src-8d8cfc7019e50af96a40b12b3e707424334bb9b6.tar.bz2
Use a less gigantor base font for TOOLKIT_VIEWS to better match the aesthetic of the bitmap-based UI.
Review URL: http://codereview.chromium.org/119300 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/resource_bundle.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc
index e3b4875..4acac71 100644
--- a/app/resource_bundle.cc
+++ b/app/resource_bundle.cc
@@ -160,6 +160,11 @@ void ResourceBundle::LoadFontsIfNecessary() {
AutoLock lock_scope(lock_);
if (!base_font_.get()) {
base_font_.reset(new gfx::Font());
+#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
+ // Toolkit views needs a less gigantor base font to more correctly match
+ // metrics for the bitmap-based UI.
+ *base_font_ = base_font_->DeriveFont(-1);
+#endif
small_font_.reset(new gfx::Font());
*small_font_ = base_font_->DeriveFont(-2);