summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 19:40:52 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 19:40:52 +0000
commit761a23dc57767c16599b03df11547cc810d31968 (patch)
tree7d5ca17842c75a30c723d80982fbb5d20b38717c /chrome
parent800065dcdca61a5012b3e01059fab456d612e101 (diff)
downloadchromium_src-761a23dc57767c16599b03df11547cc810d31968.zip
chromium_src-761a23dc57767c16599b03df11547cc810d31968.tar.gz
chromium_src-761a23dc57767c16599b03df11547cc810d31968.tar.bz2
[gtk] make tab title font irrespective of display DPI.
The font size is changed from 9 to 13 in order to offset the new correction. The font has the same same pixel size that was displayed before on my 101 DPI display. BUG=62536 TEST=using Xephyr -dpi XXX Review URL: http://codereview.chromium.org/4837002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65971 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/gtk/tabs/tab_renderer_gtk.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
index 318fcbe..cf1f62c0 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
@@ -22,6 +22,7 @@
#include "chrome/common/notification_service.h"
#include "gfx/canvas_skia_paint.h"
#include "gfx/favicon_size.h"
+#include "gfx/platform_font_gtk.h"
#include "gfx/skbitmap_operations.h"
#include "grit/app_resources.h"
#include "grit/generated_resources.h"
@@ -1070,10 +1071,11 @@ void TabRendererGtk::InitResources() {
LoadTabImages();
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- // Force the font size to 9pt, which matches Windows' default font size
- // (taken from the system).
const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
- title_font_ = new gfx::Font(base_font.GetFontName(), 9);
+ // Dividing by the pango scale factor maintains an absolute pixel size across
+ // all DPIs.
+ int size = static_cast<int>(13 / gfx::PlatformFontGtk::GetPangoScaleFactor());
+ title_font_ = new gfx::Font(base_font.GetFontName(), size);
title_font_height_ = title_font_->GetHeight();
crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);