applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

display: Reset configuration when switching layouting modes

Browse source 
When switching between screen mirroring and joining displays the
configuration needs to be reset. Otherwise the monitor scaling will
not be set back to the current scaling again.

Split out the code to reset the current configuration and call that when
the mode is switched to ensure the changes are minimal.

https://bugzilla.gnome.org/show_bug.cgi?id=790768
This commit is contained in:
Benjamin Berg 2017-11-24 14:27:49 +01:00
parent c87d8504ea
commit 3f3c4bed87
1 changed files with 34 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

50
panels/display/cc-display-panel.c
View file

@ -124,6 +124,8 @@ on_area_paint (FooScrollArea *area,
static char *
make_display_size_string (int width_mm,
int height_mm);
static void
reset_current_config (CcDisplayPanel *panel);
static char *
make_output_ui_name (CcDisplayMonitor *output)
@ -1751,6 +1753,8 @@ two_output_visible_child_changed (CcDisplayPanel *panel,
GtkWidget *bin;
GList *children, *l;
reset_current_config (panel);
children = gtk_container_get_children (GTK_CONTAINER (stack));
for (l = children; l; l = l->next)
{
@ -2038,35 +2042,23 @@ make_multi_output_ui (CcDisplayPanel *panel)
}
static void
on_screen_changed (CcDisplayPanel *panel)
reset_current_config (CcDisplayPanel *panel)
{
CcDisplayPanelPrivate *priv = panel->priv;
CcDisplayConfig *current;
GList *outputs, *l;
GtkWidget *main_widget;
guint n_outputs;
if (!priv->manager)
return;
reset_titlebar (panel);
main_widget = gtk_stack_get_child_by_name (GTK_STACK (priv->stack), "main");
if (main_widget)
gtk_widget_destroy (main_widget);
CcDisplayConfig *current;
g_clear_object (&priv->current_config);
priv->current_output = NULL;
current = cc_display_config_manager_get_current (priv->manager);
if (!current)
goto show_error;
return;
priv->current_config = current;
ensure_output_numbers (panel);
ensure_monitor_labels (panel);
priv->current_output = NULL;
outputs = g_object_get_data (G_OBJECT (current), "ui-sorted-outputs");
for (l = outputs; l; l = l->next)
{
@ -2078,10 +2070,36 @@ on_screen_changed (CcDisplayPanel *panel)
priv->current_output = output;
break;
}
}
static void
on_screen_changed (CcDisplayPanel *panel)
{
CcDisplayPanelPrivate *priv = panel->priv;
GtkWidget *main_widget;
GList *outputs;
guint n_outputs;
if (!priv->manager)
return;
reset_titlebar (panel);
main_widget = gtk_stack_get_child_by_name (GTK_STACK (priv->stack), "main");
if (main_widget)
gtk_widget_destroy (main_widget);
reset_current_config (panel);
if (!priv->current_config)
goto show_error;
ensure_monitor_labels (panel);
if (!priv->current_output)
goto show_error;
outputs = g_object_get_data (G_OBJECT (priv->current_config), "ui-sorted-outputs");
n_outputs = g_list_length (outputs);
if (priv->lid_is_closed)
{