Merge lp:~3v1n0/unity-control-center/lowgfx-listens-compiz-profile into lp:unity-control-center

[Marco Trevisan (Treviño)]

Appearance: listen to compiz-profile key instead of lowgfx

In order to know whether we're running in lowgfx mode or
not is safer to use the compiz profile in use, since the gsettings
key might be unset, and thus in this case we just fallback
to automatic mode.

[Sebastien Bacher (seb128)]

looks good, thanks

review: Approve

[lp:~3v1n0/unity-control-center/lowgfx-listens-compiz-profile]

12895. By Marco Trevisan (Treviño) on 2017-07-18

Appearance: avoid the flip-flop between settings ignoring signals

12896. By Marco Trevisan (Treviño) on 2017-07-18

Appearance: set show-desktop to false when resetting the settings

=== modified file 'panels/appearance/appearance.ui'
--- panels/appearance/appearance.ui	2017-07-10 11:00:57 +0000
+++ panels/appearance/appearance.ui	2017-07-18 16:32:14 +0000
@@ -178,6 +178,19 @@
                               </packing>
                             </child>
                             <child>
+                              <object class="GtkLabel" id="slide-label">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
+                                <property name="xalign">0</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkLabel" id="strut">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
@@ -189,19 +202,6 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkLabel" id="slide-label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" comments="This refers to a slideshow background">Changes throughout the day</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -1083,7 +1083,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="unity_gfx_mode_selector_box">
+              <object class="GtkBox" id="unity_gfx_mode_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="margin_left">10</property>
@@ -1123,7 +1123,7 @@
                     <property name="orientation">vertical</property>
                     <property name="spacing">2</property>
                     <child>
-                      <object class="GtkBox">
+                      <object class="GtkBox" id="unity_gfx_mode_selectors_box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="spacing">5</property>

=== modified file 'panels/appearance/cc-appearance-panel.c'
--- panels/appearance/cc-appearance-panel.c	2017-07-10 11:00:57 +0000
+++ panels/appearance/cc-appearance-panel.c	2017-07-18 16:32:14 +0000
@@ -302,6 +302,8 @@
       g_object_unref (priv->current_background);
       priv->current_background = NULL;
     }
+    
+  g_source_remove_by_user_data (object);
 
   G_OBJECT_CLASS (cc_appearance_panel_parent_class)->finalize (object);
 }
@@ -2077,6 +2079,36 @@
   return is_available;
 }
 
+static void gfx_mode_widget_refresh (CcAppearancePanel *self);
+
+static gboolean
+gfx_mode_changed_timeout (gpointer data)
+{
+  CcAppearancePanel *self = CC_APPEARANCE_PANEL (data);
+  CcAppearancePanelPrivate *priv = self->priv;
+
+  gfx_mode_widget_refresh (self);
+  gtk_widget_set_sensitive (WID ("unity_gfx_mode_selectors_box"), TRUE);
+  
+  return FALSE;
+}
+
+static void
+on_gfx_mode_changed (GtkToggleButton *button,
+                     gpointer user_data)
+{
+  CcAppearancePanel *self = CC_APPEARANCE_PANEL (user_data);
+  CcAppearancePanelPrivate *priv = self->priv;
+
+  gboolean low_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (WID ("unity_gfx_mode_low_enable")));
+  gtk_widget_set_sensitive (WID ("unity_gfx_mode_selectors_box"), FALSE);
+ 
+  g_settings_set_boolean (priv->unity_own_settings, UNITY_LOWGFX_KEY, low_enabled);
+
+  gfx_mode_widget_refresh (self);
+  g_timeout_add (200, gfx_mode_changed_timeout, self);
+}
+
 static void
 gfx_mode_widget_refresh (CcAppearancePanel *self)
 {
@@ -2090,32 +2122,19 @@
   
   if (!has_setting || !has_profile)
     return;
-  
-  gboolean enable_lowgfx = g_settings_get_boolean (priv->unity_own_settings, UNITY_LOWGFX_KEY);
-
-  if (enable_lowgfx == FALSE)
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("unity_gfx_mode_full_enable")), TRUE);
-  else
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("unity_gfx_mode_low_enable")), TRUE);
-}
-
-static void
-on_gfx_mode_changed (GtkToggleButton *button,
-                     gpointer user_data)
-{
-  CcAppearancePanel *self = CC_APPEARANCE_PANEL (user_data);
-  CcAppearancePanelPrivate *priv = self->priv;
-
-  gboolean low_enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (WID ("unity_gfx_mode_low_enable")));
-  g_settings_set_boolean (priv->unity_own_settings, UNITY_LOWGFX_KEY, low_enabled);
-}
-
-static void
-ext_lowgfx_changed_callback (GroupedGSettings* compiz_gs,
-                             gchar *key,
-                             gpointer user_data)
-{
-  gfx_mode_widget_refresh (CC_APPEARANCE_PANEL (user_data));
+
+  GtkToggleButton *active_toggle, *low_toggle, *full_toggle;
+  gchar *compiz_profile = g_settings_get_string (priv->compiz_settings, COMPIZ_CURRENT_PROFILE_KEY);
+  gboolean enable_lowgfx = g_strcmp0 (compiz_profile, UNITY_LOWGFX_PROFILE) == 0;
+  low_toggle = GTK_TOGGLE_BUTTON (WID ("unity_gfx_mode_low_enable"));
+  full_toggle = GTK_TOGGLE_BUTTON (WID ("unity_gfx_mode_full_enable"));
+  active_toggle = enable_lowgfx ? low_toggle : full_toggle;
+
+  g_signal_handlers_block_by_func (low_toggle, on_gfx_mode_changed, self);
+  gtk_toggle_button_set_active (active_toggle, TRUE);
+  g_signal_handlers_unblock_by_func (low_toggle, on_gfx_mode_changed, self);
+
+  g_free (compiz_profile);
 }
 
 static void
@@ -2138,6 +2157,7 @@
 
   grouped_gsettings_set_default_profile (self->priv->unity_compiz_gs, compiz_profile);
   grouped_gsettings_set_default_profile (self->priv->compizcore_compiz_gs, compiz_profile);
+  gfx_mode_widget_refresh (self);
 
   g_free (compiz_profile);
 }
@@ -2165,7 +2185,7 @@
     g_settings_reset (priv->unity_own_settings, UNITY_LOWGFX_KEY);
 
   GtkToggleButton *showdesktop = GTK_TOGGLE_BUTTON (WID ("check_showdesktop_in_launcher"));
-  gtk_toggle_button_set_active(showdesktop, TRUE);
+  gtk_toggle_button_set_active(showdesktop, FALSE);
 }
 
 /* <hacks> */
@@ -2341,10 +2361,6 @@
   menuvisibility_widget_refresh (self);
 
   /* Low gfx */
-  g_signal_connect (priv->unity_own_settings, "changed::" UNITY_LOWGFX_KEY,
-                    G_CALLBACK (ext_lowgfx_changed_callback), self);
-  g_signal_connect (WID ("unity_gfx_mode_full_enable"), "toggled",
-                    G_CALLBACK (on_gfx_mode_changed), self);
   g_signal_connect (WID ("unity_gfx_mode_low_enable"), "toggled",
                     G_CALLBACK (on_gfx_mode_changed), self);
   gfx_mode_widget_refresh (self);