[Xfce4-commits] r29673 - in xfwm4/trunk: . settings-dialogs src

[Olivier Fourdan]

Author: olivier
Date: 2009-03-19 09:16:34 +0000 (Thu, 19 Mar 2009)
New Revision: 29673

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/NEWS
   xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade
   xfwm4/trunk/settings-dialogs/xfwm4-settings.c
   xfwm4/trunk/src/settings.c
Log:
	* settings-dialogs/xfwm4-settings.c, 
	  settings-dialogs/xfwm4-dialog.glade,
	  src/settings.c: Reduce minimum timeout for focus delay in focus 
	  follow mouse (100ms was way too much),

Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog	2009-03-17 21:01:51 UTC (rev 29672)
+++ xfwm4/trunk/ChangeLog	2009-03-19 09:16:34 UTC (rev 29673)
@@ -1,3 +1,11 @@
+2009-03-19	olivier
+
+	* settings-dialogs/xfwm4-settings.c, 
+	  settings-dialogs/xfwm4-dialog.glade,
+	  src/settings.c: Reduce minimum timeout for focus delay in focus 
+	  follow mouse (100ms was way too much),
+      Fix raise delay settings in xfwm4 dialog being totally ignored
+
 2009-03-13	olivier
 
 	* src/focus.c: do not set the demand attendtion flag if the 

Modified: xfwm4/trunk/NEWS
===================================================================
--- xfwm4/trunk/NEWS	2009-03-17 21:01:51 UTC (rev 29672)
+++ xfwm4/trunk/NEWS	2009-03-19 09:16:34 UTC (rev 29673)
@@ -4,6 +4,9 @@
 - Reduce repaint timeout in the compositor (Bug #5080)
 - Fix applications getting focused when focus on map is unset even 
   without focus stealing prevention enabled (Bug #5044)
+- Reduce minimum timeout for focus delay in focus follow mouse (100ms was way
+  too much)
+- Fix raise delay settings in xfwm4 dialog being totally ignored
 
 4.6.0
 =====

Modified: xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade
===================================================================
--- xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade	2009-03-17 21:01:51 UTC (rev 29672)
+++ xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade	2009-03-19 09:16:34 UTC (rev 29673)
@@ -592,7 +592,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
-                                        <property name="adjustment">100 100 2000 1 10 0</property>
+                                        <property name="adjustment">5 5 2000 1 10 0</property>
                                         <property name="draw_value">False</property>
                                       </widget>
                                       <packing>
@@ -744,7 +744,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
-                                            <property name="adjustment">100 100 2000 1 10 0</property>
+                                            <property name="adjustment">5 5 2000 1 10 0</property>
                                             <property name="draw_value">False</property>
                                           </widget>
                                           <packing>

Modified: xfwm4/trunk/settings-dialogs/xfwm4-settings.c
===================================================================
--- xfwm4/trunk/settings-dialogs/xfwm4-settings.c	2009-03-17 21:01:51 UTC (rev 29672)
+++ xfwm4/trunk/settings-dialogs/xfwm4-settings.c	2009-03-19 09:16:34 UTC (rev 29673)
@@ -405,6 +405,7 @@
   GtkWidget          *shortcuts_clear_button;
   GtkWidget          *shortcuts_reset_button;
   GtkWidget          *focus_delay_scale;
+  GtkWidget          *focus_raise_delay_scale;
   GtkWidget          *raise_on_click_check;
   GtkWidget          *raise_on_focus_check;
   GtkWidget          *click_to_focus_radio;
@@ -614,6 +615,7 @@
 
   /* Focus tab widgets */
   focus_delay_scale = glade_xml_get_widget (settings->priv->glade_xml, "focus_delay_scale");
+  focus_raise_delay_scale = glade_xml_get_widget (settings->priv->glade_xml, "focus_raise_delay_scale");
   focus_new_check = glade_xml_get_widget (settings->priv->glade_xml, "focus_new_check");
   raise_on_focus_check = glade_xml_get_widget (settings->priv->glade_xml, "raise_on_focus_check");
   raise_on_click_check = glade_xml_get_widget (settings->priv->glade_xml, "raise_on_click_check");
@@ -622,6 +624,8 @@
   /* Focus tab */
   xfconf_g_property_bind (settings->priv->wm_channel, "/general/focus_delay", G_TYPE_INT,
                           gtk_range_get_adjustment (GTK_RANGE (focus_delay_scale)), "value");
+  xfconf_g_property_bind (settings->priv->wm_channel, "/general/raise_delay", G_TYPE_INT,
+                          gtk_range_get_adjustment (GTK_RANGE (focus_raise_delay_scale)), "value");
   xfconf_g_property_bind (settings->priv->wm_channel, "/general/raise_on_click", G_TYPE_BOOLEAN,
                           raise_on_click_check, "active");
   xfconf_g_property_bind (settings->priv->wm_channel, "/general/raise_on_focus", G_TYPE_BOOLEAN,

Modified: xfwm4/trunk/src/settings.c
===================================================================
--- xfwm4/trunk/src/settings.c	2009-03-17 21:01:51 UTC (rev 29672)
+++ xfwm4/trunk/src/settings.c	2009-03-19 09:16:34 UTC (rev 29673)
@@ -1065,11 +1065,11 @@
             case G_TYPE_INT:
                 if (!strcmp (name, "raise_delay"))
                 {
-                    screen_info->params->raise_delay = CLAMP (g_value_get_int (value), 100, 2000);
+                    screen_info->params->raise_delay = CLAMP (g_value_get_int (value), 5, 2000);
                 }
                 else if (!strcmp (name, "focus_delay"))
                 {
-                    screen_info->params->focus_delay = CLAMP (g_value_get_int (value), 100, 2000);
+                    screen_info->params->focus_delay = CLAMP (g_value_get_int (value), 5, 2000);
                 }
                 else if (!strcmp (name, "snap_width"))
                 {