summaryrefslogtreecommitdiff
path: root/plugins/a11y-keyboard
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2017-12-02 01:15:07 +0100
committerPablo Barciela <[email protected]>2017-12-02 15:58:23 +0100
commit788babedafaf59d8b7a36cb0ef3b0b1f0e5f732c (patch)
tree353bfe6e744432e037b1d04ad5705cb1dcb14f26 /plugins/a11y-keyboard
parent4026dbbfc77b3d7a2769d2e3615cc259290c96f7 (diff)
downloadmate-settings-daemon-788babedafaf59d8b7a36cb0ef3b0b1f0e5f732c.tar.bz2
mate-settings-daemon-788babedafaf59d8b7a36cb0ef3b0b1f0e5f732c.tar.xz
Fix: big fonts by default with "org.mate.desktop.font-rendering.dpi"
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1517547
Diffstat (limited to 'plugins/a11y-keyboard')
-rw-r--r--plugins/a11y-keyboard/msd-a11y-preferences-dialog.c27
1 files changed, 6 insertions, 21 deletions
diff --git a/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
index 2dedd56..165d5b0 100644
--- a/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
+++ b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
@@ -29,6 +29,7 @@
#include <glib/gi18n.h>
#include <glib-object.h>
#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
#include <dbus/dbus-glib.h>
@@ -177,27 +178,11 @@ get_dpi_from_x_server (void)
if (screen != NULL) {
double width_dpi;
double height_dpi;
- gint sc_width;
- gint sc_height;
-#if GTK_CHECK_VERSION (3, 22, 0)
- GdkDisplay *display;
- GdkMonitor *monitor;
-
-
- display = gdk_screen_get_display (screen);
- monitor = gdk_display_get_primary_monitor (display);
-#endif
-
- gdk_window_get_geometry (gdk_screen_get_root_window (screen), NULL, NULL,
- &sc_width, &sc_height);
-
-#if GTK_CHECK_VERSION (3, 22, 0)
- width_dpi = dpi_from_pixels_and_mm (sc_width, gdk_monitor_get_width_mm (monitor));
- height_dpi = dpi_from_pixels_and_mm (sc_height, gdk_monitor_get_height_mm (monitor));
-#else
- width_dpi = dpi_from_pixels_and_mm (sc_width, gdk_screen_get_width_mm (screen));
- height_dpi = dpi_from_pixels_and_mm (sc_height, gdk_screen_get_height_mm (screen));
-#endif
+
+ Screen *xscreen = gdk_x11_screen_get_xscreen (screen);
+
+ width_dpi = dpi_from_pixels_and_mm (WidthOfScreen (xscreen), WidthMMOfScreen (xscreen));
+ height_dpi = dpi_from_pixels_and_mm (HeightOfScreen (xscreen), HeightMMOfScreen (xscreen));
if (width_dpi < DPI_LOW_REASONABLE_VALUE
|| width_dpi > DPI_HIGH_REASONABLE_VALUE