From ab40dfdd516650f4d60ce1690fb414f6d5de2bb2 Mon Sep 17 00:00:00 2001 From: Adel Gadllah Date: Mon, 28 Jul 2014 09:57:08 +0200 Subject: [PATCH] Revert "prefs: Scale the root window cursor by the scale factor" This reverts commit 4fe66ce0a950134da20089319d68ba679be13d35. This is wrong ... we should not scale the cursor size but read the cursor xsettings that gets exported by gsd. Also this won't update on resolution changes. https://bugzilla.gnome.org/show_bug.cgi?id=729337 --- src/core/prefs.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/core/prefs.c b/src/core/prefs.c index 647f01afa..ed73e5d4f 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -1347,26 +1347,10 @@ meta_prefs_get_cursor_theme (void) return cursor_theme; } -static int -get_scale_factor (void) -{ - GdkScreen *screen; - GValue value = G_VALUE_INIT; - - g_value_init (&value, G_TYPE_INT); - - /* XXX: Should this be in ui/ ? Or MetaMonitorManager? */ - screen = gdk_screen_get_default (); - if (gdk_screen_get_setting (screen, "gdk-window-scaling-factor", &value)) - return g_value_get_int (&value); - else - return 1; -} - int meta_prefs_get_cursor_size (void) { - return cursor_size * get_scale_factor (); + return cursor_size; }