gtk+ r21534 - in trunk: . gtk

[denisw svn gnome org]

Author: denisw
Date: Sat Sep 27 12:53:05 2008
New Revision: 21534
URL: http://svn.gnome.org/viewvc/gtk+?rev=21534&view=rev

Log:
2008-09-27  Denis Washington  <denisw svn gnome org>

	* gtk/gtkiconview.c: only draw keyboard focus when keyboard navigation
	is used, like GtkTreeView. (Bug #553575)


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkiconview.c

Modified: trunk/gtk/gtkiconview.c
==============================================================================
--- trunk/gtk/gtkiconview.c	(original)
+++ trunk/gtk/gtkiconview.c	Sat Sep 27 12:53:05 2008
@@ -160,6 +160,8 @@
 
   gint tooltip_column;
 
+  guint draw_focus : 1;
+
   /* Drag-and-drop. */
   GdkModifierType start_button_mask;
   gint pressed_button;
@@ -989,6 +991,8 @@
   icon_view->priv->row_spacing = 6;
   icon_view->priv->column_spacing = 6;
   icon_view->priv->margin = 6;
+
+  icon_view->priv->draw_focus = TRUE;
 }
 
 static void
@@ -1432,7 +1436,8 @@
       
       gtk_icon_view_paint_item (icon_view, cr, item, &expose->area, 
 				icon_view->priv->bin_window,
-				item->x, item->y, TRUE); 
+				item->x, item->y,
+				icon_view->priv->draw_focus); 
  
       if (dest_index == item->index)
 	dest_item = item;
@@ -2076,6 +2081,8 @@
 	    gtk_icon_view_start_rubberbanding (icon_view, event->x, event->y);
 	}
 
+      /* don't draw keyboard focus around an clicked-on item */
+      icon_view->priv->draw_focus = FALSE;
     }
 
   if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
@@ -3711,6 +3718,8 @@
   icon_view->priv->ctrl_pressed = FALSE;
   icon_view->priv->shift_pressed = FALSE;
 
+  icon_view->priv->draw_focus = TRUE;
+
   return TRUE;
 }