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

display: Only enforce single mode when desired by UI

Browse source 
We should only enforce single mode, when we have exactly two monitors
and the two button UI is used to switch between them in single mode.
Move the code to ensure the single configuration into the relevant
callback handler, rather than trying to solve this globally.
This commit is contained in:
Benjamin Berg 2019-03-20 15:07:47 +01:00
parent 98d20659b7
commit e387b3bb86
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -542,9 +542,32 @@ on_output_selection_combo_changed_cb (CcDisplayPanel *panel)
static void static void
on_output_selection_two_toggled_cb (CcDisplayPanel *panel, GtkRadioButton *btn) on_output_selection_two_toggled_cb (CcDisplayPanel *panel, GtkRadioButton *btn)
{ {
CcDisplayMonitor *output;
if (panel->rebuilding_counter > 0)
return;
if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (btn))) if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (btn)))
return; return;
output = g_object_get_data (G_OBJECT (btn), "display");
/* Stay in single mode when we are in single mode.
* This UI must never cause a switch between the configuration type.
* this is in contrast to the combobox monitor selection, which may
* switch to a disabled output both in SINGLE/MULTI mode without
* anything changing.
*/
if (cc_panel_get_selected_type (panel) == CC_DISPLAY_CONFIG_SINGLE)
{
if (panel->current_output)
cc_display_monitor_set_active (panel->current_output, FALSE);
if (output)
cc_display_monitor_set_active (output, TRUE);
update_apply_button (panel);
}
set_current_output (panel, g_object_get_data (G_OBJECT (btn), "display"), FALSE); set_current_output (panel, g_object_get_data (G_OBJECT (btn), "display"), FALSE);
} }
@ -635,16 +658,6 @@ set_current_output (CcDisplayPanel *panel,
panel->rebuilding_counter++; panel->rebuilding_counter++;
if (changed && cc_panel_get_selected_type (panel) == CC_DISPLAY_CONFIG_SINGLE)
{
if (output)
cc_display_monitor_set_active (output, TRUE);
if (panel->current_output && output != panel->current_output)
cc_display_monitor_set_active (panel->current_output, FALSE);
update_apply_button (panel);
}
panel->current_output = output; panel->current_output = output;
if (panel->current_output) if (panel->current_output)