зеркало из https://github.com/mozilla/pjs.git
Bug 384090 ��� [GTK+] incorrect logical resolution for converting font sizes in pt, etc.
Get the actual resolution used by GTK+/X instead of a best-guess based on screen dimensions r=Behdad Esfahbod, Owen Taylor sr=Robert O'Callahan a=Damon Sicore
This commit is contained in:
Родитель
2721c25e60
Коммит
47fe78dd0a
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче