From 4813d6259ff1b9b88e127bb171b3fe5c412a9585 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 19 Jun 2008 16:38:18 +0000
Subject: ** Fix for bug #382783

2008-06-19  Milan Crha  <mcrha@redhat.com>

	** Fix for bug #382783

	* filter/filter-rule.c: (do_grab_focus_cb), (more_parts), (get_widget):
	* mail/em-filter-rule.c: (do_grab_focus_cb), (more_parts), (get_widget):
	Grab focus of new rule part on adding and scroll to the bottom too.


svn path=/trunk/; revision=35654
---
 filter/filter-rule.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'filter/filter-rule.c')

diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 4d5d76505c..a200876df1 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -743,6 +743,20 @@ attach_rule (GtkWidget *rule, struct _rule_data *data, FilterPart *part, int row
 	gtk_widget_show (remove);
 }
 
+static void
+do_grab_focus_cb (GtkWidget *widget, gpointer data)
+{
+	gboolean *done = (gboolean *) data;
+
+	if (*done)
+		return;
+
+	if (widget && GTK_WIDGET_CAN_FOCUS (widget)) {
+		*done = TRUE;
+		gtk_widget_grab_focus (widget);
+	}
+}
+
 static void
 more_parts (GtkWidget *button, struct _rule_data *data)
 {
@@ -772,6 +786,24 @@ more_parts (GtkWidget *button, struct _rule_data *data)
 		rows = GTK_TABLE (data->parts)->nrows;
 		gtk_table_resize (GTK_TABLE (data->parts), rows + 1, 2);
 		attach_rule (w, data, new, rows);
+
+		if (GTK_IS_CONTAINER (w)) {
+			gboolean done = FALSE;
+
+			gtk_container_foreach (GTK_CONTAINER (w), do_grab_focus_cb, &done);
+		} else
+			gtk_widget_grab_focus (w);
+
+		/* also scroll down to see new part */
+		w = (GtkWidget*) g_object_get_data (G_OBJECT (button), "scrolled-window");
+		if (w) {
+			GtkAdjustment *adjustment;
+
+			adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w));
+			if (adjustment)
+				gtk_adjustment_set_value (adjustment, adjustment->upper);
+				
+		}
 	}
 }
 
@@ -952,6 +984,8 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
 
 	gtk_widget_show_all (vbox);
 
+	g_object_set_data (G_OBJECT (add), "scrolled-window", scrolledwindow);
+
 	return vbox;
 }
 
-- 
cgit v1.2.3