isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hidpi: Listen for gtk-xft-dpi instead of monitors-changed

Browse Source 
Currently we update the scale factor on startup and when we get a
monitors-changed signal, which is not the only cases where the setting changes. We cannot listen for gdk-window-scaling-factor changes because it is not
exported to gdk.

So use gtk-xft-dpi which also indicates a scale factor change.

When someone changes gtk-xft-dpi directly without changing the scale factor
we will just re-read the gdk-window-scaling-factor so no harm is done.

https://bugzilla.gnome.org/show_bug.cgi?id=726238
This commit is contained in:
Adel Gadllah 2014-03-13 13:56:02 +01:00
parent e117aa5297
commit 5616bbd45b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/shell-global.c
View File

@ -748,7 +748,9 @@ global_stage_after_paint (gpointer data)
static void static void
update_scale_factor (GdkScreen *screen, gpointer data) update_scale_factor (GtkSettings *settings,
GParamSpec *pspec,
gpointer data)
{ {
ShellGlobal *global = SHELL_GLOBAL (data); ShellGlobal *global = SHELL_GLOBAL (data);
ClutterStage *stage = CLUTTER_STAGE (global->stage); ClutterStage *stage = CLUTTER_STAGE (global->stage);
@ -938,19 +940,18 @@ _shell_global_set_plugin (ShellGlobal *global,
g_signal_connect (global->meta_display, "notify::focus-window", g_signal_connect (global->meta_display, "notify::focus-window",
G_CALLBACK (focus_window_changed), global); G_CALLBACK (focus_window_changed), global);
/* /* gdk-window-scaling-factor is not exported to gtk-settings
* We connect to GdkScreen's monitors-changed here to avoid * because it is handled inside gdk, so we use gtk-xft-dpi instead
* a race condition. GdkScreen's monitors-changed signal is * which also changes when the scale factor changes.
* emitted *after* the xsetting has been updated.
*/ */
g_signal_connect (global->gdk_screen, "monitors-changed", g_signal_connect (gtk_settings_get_default (), "notify::gtk-xft-dpi",
G_CALLBACK (update_scale_factor), global); G_CALLBACK (update_scale_factor), global);
gdk_event_handler_set (gnome_shell_gdk_event_handler, global, NULL); gdk_event_handler_set (gnome_shell_gdk_event_handler, global, NULL);
global->focus_manager = st_focus_manager_get_for_stage (global->stage); global->focus_manager = st_focus_manager_get_for_stage (global->stage);
update_scale_factor (global->gdk_screen, global); update_scale_factor (gtk_settings_get_default (), NULL, global);
} }
GjsContext * GjsContext *