[maemo-commits] [maemo-commits] r19558 - in projects/haf/trunk/gtk+: . gdk/x11

[From: subversion at stage.maemo.org]

Author: kalikiana
Date: 2009-12-09 12:06:05 +0200 (Wed, 09 Dec 2009)
New Revision: 19558

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/x11/gdkscreen-x11.c
Log:
2009-12-09  Christian Dywan  <christian at lanedo.com>

	Fixes: NB#130532 - Fonts are getting magnified

	* gdk/x11/gdkscreen-x11.c (_gdk_x11_screen_size_changed): Manually
	update the screen size in milimeters.

Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-12-08 15:35:14 UTC (rev 19557)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-12-09 10:06:05 UTC (rev 19558)
@@ -1,3 +1,10 @@
+2009-12-09  Christian Dywan  <christian at lanedo.com>
+
+	Fixes: NB#130532 - Fonts are getting magnified
+
+	* gdk/x11/gdkscreen-x11.c (_gdk_x11_screen_size_changed): Manually
+	update the screen size in milimeters.
+
 2009-12-03  Christian Dywan  <christian at lanedo.com>
 
 	Fixes: NB#125177 - GtkButton + hildon_gtk_widget_set_theme_size() has

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkscreen-x11.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkscreen-x11.c	2009-12-08 15:35:14 UTC (rev 19557)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkscreen-x11.c	2009-12-09 10:06:05 UTC (rev 19558)
@@ -923,7 +923,7 @@
                     gdk_atom_intern ("CARDINAL", FALSE),
                     0, 8, FALSE, 0, 0, 0, (guchar **) &maemo_screen_size))
     {
-      gint prop_width, prop_height;
+      gdouble prop_width, prop_height;
 
       prop_width = maemo_screen_size[0];
       prop_height = maemo_screen_size[1];
@@ -933,6 +933,8 @@
           Screen *xscreen = gdk_x11_screen_get_xscreen (screen);
           xscreen->width = prop_width;
           xscreen->height = prop_height;
+          xscreen->mwidth = (prop_width / GDK_SCREEN_X11 (screen)->xft_dpi) * 25.4;
+          xscreen->mheight = (prop_height / GDK_SCREEN_X11 (screen)->xft_dpi) * 25.4;
 
           _gdk_x11_screen_process_monitors_change (screen);
           g_signal_emit_by_name (screen, "size_changed");