summaryrefslogtreecommitdiff
path: root/gdk/gdkpango.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-05-22 04:04:51 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-05-22 04:04:51 +0000
commitf3b986724c3174fd48e14376b908d7b302a86095 (patch)
tree885706920edf8bbdbc4db2e454c0c00aeb3b3cf9 /gdk/gdkpango.c
parent3023c03a360c1b3f92800dae2d66dbfae0fa277a (diff)
downloadgtk+-f3b986724c3174fd48e14376b908d7b302a86095.tar.gz
Add new function _gdk_screen_get_font_map() and have one fontmap per
2006-05-21 Behdad Esfahbod <behdad@gnome.org> * gdk/gdkinternals.h: * gdk/gdkscreen.c (gdk_screen_class_init), (gdk_screen_finalize), (update_fontmap_resolution), (gdk_screen_set_resolution): Add new function _gdk_screen_get_font_map() and have one fontmap per screen, with the correct resolution set on it. * gdk/gdkpango.c (gdk_pango_context_get_for_screen): Use _gdk_screen_get_font_map() instead of setting resolution on the PangoCairoContext. (#342529)
Diffstat (limited to 'gdk/gdkpango.c')
-rw-r--r--gdk/gdkpango.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 9375a80545..984881aeea 100644
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -1416,20 +1416,16 @@ gdk_pango_context_get_for_screen (GdkScreen *screen)
PangoFontMap *fontmap;
PangoContext *context;
const cairo_font_options_t *options;
- double dpi;
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
- fontmap = pango_cairo_font_map_get_default ();
+ fontmap = _gdk_screen_get_font_map (screen);
context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fontmap));
options = gdk_screen_get_font_options (screen);
pango_cairo_context_set_font_options (context, options);
- dpi = gdk_screen_get_resolution (screen);
- pango_cairo_context_set_resolution (context, dpi);
-
return context;
}