[gnome-control-center/benzea/ensure-valid-config-after-loading: 4/9] display: Make rebuilding variable a counter
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/benzea/ensure-valid-config-after-loading: 4/9] display: Make rebuilding variable a counter
- Date: Wed, 20 Mar 2019 16:27:35 +0000 (UTC)
commit cab2f50e6d9de96ced7c5ebe95d5213410f01dd2
Author: Benjamin Berg <bberg redhat com>
Date: Wed Mar 20 14:59:36 2019 +0100
display: Make rebuilding variable a counter
We need to also set rebuilding while updating some other UI elements.
Make it into a counter to allow for recursive setting.
Note that additional checks for rebuilding will be added in later
commits.
panels/display/cc-display-panel.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
index 7ea5ab01a..faf5ee05b 100644
--- a/panels/display/cc-display-panel.c
+++ b/panels/display/cc-display-panel.c
@@ -63,7 +63,7 @@ struct _CcDisplayPanel
CcDisplayConfig *current_config;
CcDisplayMonitor *current_output;
- gboolean rebuilding;
+ guint rebuilding;
CcDisplayArrangement *arrangement;
CcDisplaySettings *settings;
@@ -633,6 +633,8 @@ set_current_output (CcDisplayPanel *panel,
if (!changed && !force)
return;
+ panel->rebuilding += 1;
+
if (changed && cc_panel_get_selected_type (panel) == CC_DISPLAY_CONFIG_SINGLE)
{
if (output)
@@ -684,6 +686,8 @@ set_current_output (CcDisplayPanel *panel,
cc_display_settings_set_selected_output (panel->settings, panel->current_output);
cc_display_arrangement_set_selected_output (panel->arrangement, panel->current_output);
}
+
+ panel->rebuilding -= 1;
}
static void
@@ -692,7 +696,7 @@ rebuild_ui (CcDisplayPanel *panel)
guint n_outputs, n_active_outputs, n_usable_outputs;
GList *outputs, *l;
- panel->rebuilding = TRUE;
+ panel->rebuilding += 1;
g_list_store_remove_all (panel->primary_display_list);
gtk_list_store_clear (panel->output_selection_list);
@@ -793,7 +797,7 @@ rebuild_ui (CcDisplayPanel *panel)
gtk_stack_set_visible_child_name (panel->output_selection_stack, "multi-selection");
}
- panel->rebuilding = FALSE;
+ panel->rebuilding -= 1;
update_apply_button (panel);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]