AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

inspector: handle differences in DPI between backends

Browse Source 
This fixes an issue on macOS where the text gets much larger once opening
the inspector.
This commit is contained in:
Christian Hergert 2020-11-17 10:45:25 -08:00
parent 5cc5022a8f
commit 37a8c138f9
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gtk/inspector/visual.c
View File

@ -52,6 +52,9 @@
#ifdef GDK_WINDOWING_WAYLAND
#include "wayland/gdkwayland.h"
#endif
#ifdef GDK_WINDOWING_MACOS
#include "macos/gdkmacos.h"
#endif
#include "gdk/gdk-private.h"
@ -172,35 +175,28 @@ redraw_everything (void)
g_list_free (toplevels);
}
static double
get_dpi_ratio (GtkInspectorVisual *vis)
{
#ifdef GDK_WINDOWING_MACOS
if (GDK_IS_MACOS_DISPLAY (vis->display))
return 72.0 * 1024.0;
#endif
return 96.0 * 1024.0;
}
static double
get_font_scale (GtkInspectorVisual *vis)
{
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (vis->display))
{
int dpi_int;
double ratio = get_dpi_ratio (vis);
int dpi_int;
g_object_get (gtk_settings_get_for_display (vis->display),
"gtk-xft-dpi", &dpi_int,
NULL);
g_object_get (gtk_settings_get_for_display (vis->display),
"gtk-xft-dpi", &dpi_int,
NULL);
return dpi_int / (96.0 * 1024.0);
}
#endif
#ifdef GDK_WINDOWING_WAYLAND
if (GDK_IS_WAYLAND_DISPLAY (vis->display))
{
int dpi_int;
g_object_get (gtk_settings_get_for_display (vis->display),
"gtk-xft-dpi", &dpi_int,
NULL);
return dpi_int / (96.0 * 1024.0);
}
#endif
return 1.0;
return dpi_int / ratio;
}
static void
@ -209,8 +205,10 @@ update_font_scale (GtkInspectorVisual *vis,
gboolean update_adjustment,
gboolean update_entry)
{
double ratio = get_dpi_ratio (vis);
g_object_set (gtk_settings_get_for_display (vis->display),
"gtk-xft-dpi", (int)(factor * 96 * 1024),
"gtk-xft-dpi", (int)(factor * ratio),
NULL);
if (update_adjustment)