gdm r6155 - in trunk: . gui/simple-greeter

[halfline svn gnome org]

Author: halfline
Date: Wed Apr 16 16:06:15 2008
New Revision: 6155
URL: http://svn.gnome.org/viewvc/gdm?rev=6155&view=rev

Log:
2008-04-15  Ray Strode <rstrode redhat com>

	* gui/simple-greeter/gdm-chooser-widget.c:
	(on_shink_animation_complete), (on_grow_animation_complete),
	(skip_resize_animiation): Disable search-ahead when chooser
	is shrunk.
	(clear_selection): drop focus when clearing selection.


Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-chooser-widget.c

Modified: trunk/gui/simple-greeter/gdm-chooser-widget.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-chooser-widget.c	(original)
+++ trunk/gui/simple-greeter/gdm-chooser-widget.c	Wed Apr 16 16:06:15 2008
@@ -470,6 +470,7 @@
 
         widget->priv->active_row_normalized_position = 0.5;
         set_inactive_items_visible (GDM_CHOOSER_WIDGET (widget), FALSE);
+        gtk_tree_view_set_enable_search (GTK_TREE_VIEW (widget->priv->items_view), FALSE);
         widget->priv->state = GDM_CHOOSER_WIDGET_STATE_SHRUNK;
 
         if (widget->priv->emit_activated_after_resize_animation) {
@@ -545,6 +546,7 @@
         g_assert (widget->priv->state == GDM_CHOOSER_WIDGET_STATE_GROWING);
         widget->priv->state = GDM_CHOOSER_WIDGET_STATE_GROWN;
         widget->priv->was_fully_grown = TRUE;
+        gtk_tree_view_set_enable_search (GTK_TREE_VIEW (widget->priv->items_view), TRUE);
 
         gtk_widget_grab_focus (GTK_WIDGET (widget));
 }
@@ -642,9 +644,11 @@
 {
         if (widget->priv->state == GDM_CHOOSER_WIDGET_STATE_SHRINKING) {
                 set_inactive_items_visible (GDM_CHOOSER_WIDGET (widget), FALSE);
+                gtk_tree_view_set_enable_search (GTK_TREE_VIEW (widget->priv->items_view), FALSE);
                 widget->priv->state = GDM_CHOOSER_WIDGET_STATE_SHRUNK;
         } else if (widget->priv->state == GDM_CHOOSER_WIDGET_STATE_GROWING) {
                 set_inactive_items_visible (GDM_CHOOSER_WIDGET (widget), TRUE);
+                gtk_tree_view_set_enable_search (GTK_TREE_VIEW (widget->priv->items_view), TRUE);
                 widget->priv->state = GDM_CHOOSER_WIDGET_STATE_GROWN;
                 widget->priv->was_fully_grown = FALSE;
                 gtk_widget_grab_focus (GTK_WIDGET (widget));
@@ -695,10 +699,17 @@
 clear_selection (GdmChooserWidget *widget)
 {
         GtkTreeSelection *selection;
+        GtkWidget        *window;
 
         selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget->priv->items_view));
         gtk_tree_selection_unselect_all (selection);
 
+        window = gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW);
+
+        if (window != NULL) {
+                gtk_window_set_focus (GTK_WINDOW (window), NULL);
+        }
+
         return FALSE;
 }