xulrunner/mozilla-resolution.patch
Christopher Aillon 6bb64ec85f - Fix font scaling
2008-04-27 04:14:11 +00:00

32 lines
1.2 KiB
Diff

https://bugzilla.mozilla.org/show_bug.cgi?id=384090
Index: mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp,v
retrieving revision 1.76
diff -d -u -p -r1.76 nsThebesDeviceContext.cpp
--- mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp 16 Apr 2008 03:27:03 -0000 1.76
+++ mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp 18 Apr 2008 18:41:21 -0000
@@ -49,7 +49,9 @@
#ifdef MOZ_ENABLE_GTK2
// for getenv
-#include <stdlib.h>
+#include <cstdlib>
+// for round
+#include <cmath>
#include <gtk/gtk.h>
#include <gdk/gdk.h>
@@ -170,8 +172,9 @@ nsThebesDeviceContext::SetDPI()
}
#if defined(MOZ_ENABLE_GTK2)
- float screenWidthIn = float(::gdk_screen_width_mm()) / 25.4f;
- PRInt32 OSVal = NSToCoordRound(float(::gdk_screen_width()) / screenWidthIn);
+ GdkScreen *screen = gdk_screen_get_default();
+ gtk_settings_get_for_screen(screen); // Make sure init is run so we have a resolution
+ PRInt32 OSVal = PRInt32(round(gdk_screen_get_resolution(screen)));
if (prefDPI == 0) // Force the use of the OS dpi
dpi = OSVal;