summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Fourdan <fourdan.olivier@wanadoo.fr>2009-03-19 09:16:34 +0000
committerOlivier Fourdan <fourdan.olivier@wanadoo.fr>2009-03-19 09:16:34 +0000
commit20c1540d8d5609eefedcd3e4fd3ce8728a6bddd1 (patch)
tree85773ad0432105080c26ce037203c7e6ef6e0d0a
parent00fb4cf97f980a78e90f1b87b06420dbfd9e8aed (diff)
downloadxfwm4-20c1540d8d5609eefedcd3e4fd3ce8728a6bddd1.tar.gz
* 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), (Old svn revision: 29673)
-rw-r--r--ChangeLog8
-rw-r--r--NEWS3
-rw-r--r--settings-dialogs/xfwm4-dialog.glade4
-rw-r--r--settings-dialogs/xfwm4-settings.c4
-rw-r--r--src/settings.c4
5 files changed, 19 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1064976ad..fca36b850 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/NEWS b/NEWS
index 629ad1122..7ece49cb0 100644
--- a/NEWS
+++ b/NEWS
@@ -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
=====
diff --git a/settings-dialogs/xfwm4-dialog.glade b/settings-dialogs/xfwm4-dialog.glade
index 67148b850..366c67362 100644
--- a/settings-dialogs/xfwm4-dialog.glade
+++ b/settings-dialogs/xfwm4-dialog.glade
@@ -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>
diff --git a/settings-dialogs/xfwm4-settings.c b/settings-dialogs/xfwm4-settings.c
index 8a2f03356..f8a0ca45a 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -405,6 +405,7 @@ xfwm_settings_constructed (GObject *object)
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 @@ xfwm_settings_constructed (GObject *object)
/* 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 @@ xfwm_settings_constructed (GObject *object)
/* 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,
diff --git a/src/settings.c b/src/settings.c
index c4d088b5e..de74e5f55 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1065,11 +1065,11 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel, const gchar *property_
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"))
{