Revert "shell-global: Set high dpi scaling factor"
This reverts commit ba459f4d202e6b0656994bea16edac00359edb1f. This breaks gdm.
This commit is contained in:
parent
32110a9866
commit
6f87b01c47
@ -746,20 +746,6 @@ global_stage_after_paint (gpointer data)
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
|
||||||
update_scale_factor (gpointer data)
|
|
||||||
{
|
|
||||||
ShellGlobal *global = SHELL_GLOBAL (data);
|
|
||||||
ClutterStage *stage = CLUTTER_STAGE (global->stage);
|
|
||||||
StThemeContext *context = st_theme_context_get_for_stage (stage);
|
|
||||||
GValue value = G_VALUE_INIT;
|
|
||||||
|
|
||||||
g_value_init (&value, G_TYPE_INT);
|
|
||||||
gdk_screen_get_setting (global->gdk_screen, "gdk-window-scaling-factor", &value);
|
|
||||||
g_object_set (context, "scale-factor", g_value_get_int (&value), NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* This is an IBus workaround. The flow of events with IBus is that every time
|
/* This is an IBus workaround. The flow of events with IBus is that every time
|
||||||
* it gets gets a key event, it:
|
* it gets gets a key event, it:
|
||||||
*
|
*
|
||||||
@ -938,19 +924,9 @@ _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);
|
||||||
|
|
||||||
/*
|
|
||||||
* We connect to GdkScreen's monitors-changed here to avoid
|
|
||||||
* a race condition. GdkScreen's monitors-changed signal is
|
|
||||||
* emitted *after* the xsetting has been updated.
|
|
||||||
*/
|
|
||||||
g_signal_connect (global->gdk_screen, "monitors-changed",
|
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GjsContext *
|
GjsContext *
|
||||||
|
Loading…
x
Reference in New Issue
Block a user