r1246 - trunk/src/target/OM-2007/applications/openmoko-mainmenu/src

[zhiyong_sun at sita.openmoko.org]

Author: zhiyong_sun
Date: 2007-03-05 09:40:00 +0100 (Mon, 05 Mar 2007)
New Revision: 1246

Modified:
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
Log:
change item activated function: item, which has been selected, will be activated

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c	2007-03-05 03:57:03 UTC (rev 1245)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c	2007-03-05 08:40:00 UTC (rev 1246)
@@ -98,7 +98,8 @@
   gint max_text_len;
   gint decr_width;
   gboolean decorated;
-  int total_items;
+  gint total_items;
+  gboolean activate;
 
   guint ctrl_pressed : 1;
   guint shift_pressed : 1;
@@ -984,6 +985,7 @@
   icon_view->priv->max_text_len = 30;
   icon_view->priv->decr_width = 10;
   icon_view->priv->decorated = FALSE;
+  icon_view->priv->activate = FALSE;
   
   pango_layout_set_wrap (icon_view->priv->layout, PANGO_WRAP_WORD_CHAR);
 
@@ -1552,6 +1554,7 @@
 		      moko_icon_view_queue_draw_item (icon_view, item);
 		      dirty = TRUE;
 		    }
+		  else icon_view->priv->activate = TRUE;
 		}
 	      moko_icon_view_set_cursor_item (icon_view, item);
 	      icon_view->priv->anchor_item = item;
@@ -1582,23 +1585,6 @@
 
     }
 
- /* if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) //GTK: double ckicked launch "item-activated" event
-   {
-      item = moko_icon_view_get_item_at_pos (icon_view,
-					    event->x, event->y);
-
-      if (item && item == icon_view->priv->last_single_clicked)
-	{
-	  GtkTreePath *path;
-
-	  path = gtk_tree_path_new_from_indices (item->index, -1);
-	  moko_icon_view_item_activated (icon_view, path);
-	  gtk_tree_path_free (path);
-	}
-
-      icon_view->priv->last_single_clicked = NULL;
-    }
-  */
   if (dirty)
     g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);
 
@@ -1613,9 +1599,9 @@
 
   icon_view = MOKO_ICON_VIEW (widget);
   
-  if (event->button == 1 && event->type == GDK_BUTTON_RELEASE)  //SUNZY : tabbing will launch "item-activated" event
+  if (event->button == 1 && event->type == GDK_BUTTON_RELEASE && icon_view->priv->activate )  //SUNZY : tabbing will launch "item-activated" event
    {
-   
+   	  icon_view->priv->activate = FALSE;
       MokoIconViewItem *item = moko_icon_view_get_item_at_pos (icon_view,
 					    event->x, event->y);