diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-08-24 03:29:06 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-08-24 03:29:06 +0000 |
| commit | 2b1bea02f28cdef4a98e26b97594eb9ea798a95d (patch) | |
| tree | d0f724924b08fbd3aa94680e7b4c1a25bd9468c2 /gdk/gdkscreen.h | |
| parent | 39169b6fd61bfc2c3d99c7c9154f4b5e2d8ade85 (diff) | |
| download | gtk+-2b1bea02f28cdef4a98e26b97594eb9ea798a95d.tar.gz | |
Fix for #314004, reported by Michael Reinsch:
2005-08-23 Owen Taylor <otaylor@redhat.com>
Fix for #314004, reported by Michael Reinsch:
* gdk/gdk.symbols:
* gdk/gdkscreen.[ch]: Add gdk_screen_get/set_font_options_libgtk_only()
Add gdk_screen_get/set_resolution_libgtk_only()
* gdk/gdkpango.c (gdk_pango_context_get_for_screen): Set
the options for the screen on the newly created context.
* gtk/gtksettings.c (settings_update_font_options/dpi) gtkwidget.c:
Move font options and dpi code from gtkwidget.c to gtksettings.c, set
the font options on the screen.
* gtk/gtkwidget.c (gtk_widget_update_pango_context): Just get
the font options from the screen and set them on the context.
Diffstat (limited to 'gdk/gdkscreen.h')
| -rw-r--r-- | gdk/gdkscreen.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h index 5a27cbe232..2d93a41944 100644 --- a/gdk/gdkscreen.h +++ b/gdk/gdkscreen.h @@ -24,6 +24,7 @@ #ifndef __GDK_SCREEN_H__ #define __GDK_SCREEN_H__ +#include <cairo.h> #include "gdk/gdktypes.h" #include "gdk/gdkdisplay.h" @@ -46,6 +47,9 @@ struct _GdkScreen GdkGC *normal_gcs[32]; GdkGC *exposure_gcs[32]; + + cairo_font_options_t *font_options; + double resolution; /* pixels/points scale factor for fonts */ }; struct _GdkScreenClass @@ -98,6 +102,14 @@ gboolean gdk_screen_get_setting (GdkScreen *screen, const gchar *name, GValue *value); +void gdk_screen_set_font_options_libgtk_only (GdkScreen *screen, + const cairo_font_options_t *options); +const cairo_font_options_t *gdk_screen_get_font_options_libgtk_only (GdkScreen *screen); + +void gdk_screen_set_resolution_libgtk_only (GdkScreen *screen, + gdouble dpi); +gdouble gdk_screen_get_resolution_libgtk_only (GdkScreen *screen); + G_END_DECLS #endif /* __GDK_SCREEN_H__ */ |