[EGIT] [tools/clouseau] master 01/01: Return to previously selected item on reload.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/tools/clouseau.git/commit/?id=e6800e9c9d7cc4cc8ef92a90f48fb2c74a6eed66

commit e6800e9c9d7cc4cc8ef92a90f48fb2c74a6eed66
Author: Tom Hacohen <t...@stosb.com>
Date:   Mon Dec 16 17:16:36 2013 +0000

    Return to previously selected item on reload.
---
 src/bin/clouseau_client.c | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/bin/clouseau_client.c b/src/bin/clouseau_client.c
index 32871b8..e2a57f3 100644
--- a/src/bin/clouseau_client.c
+++ b/src/bin/clouseau_client.c
@@ -84,6 +84,7 @@ struct _Gui_Elementns
    char *address;
    App_Data_St *sel_app; /* Currently selected app data */
    Elm_Object_Item *gl_it; /* Currently selected genlist item */
+   uintptr_t jump_to_ptr;
 };
 typedef struct _Gui_Elementns Gui_Elements;
 
@@ -102,6 +103,7 @@ static Ecore_Con_Reply *eet_svr = NULL;
 static Eina_Bool _add_callback_called = EINA_FALSE;
 static void _cancel_bt_clicked(void *data, Evas_Object *obj EINA_UNUSED, void 
*event_info EINA_UNUSED);
 static void _ofl_bt_clicked(void *data, Evas_Object *obj EINA_UNUSED, void 
*event_info EINA_UNUSED);
+static void _jump_to_ptr(Gui_Elements *g, uintptr_t ptr);
 
 static void
 _titlebar_string_set(Gui_Elements *g, Eina_Bool online)
@@ -264,6 +266,12 @@ _load_gui_with_list(Gui_Elements *g, Eina_List *trees)
               glflag, NULL, NULL);
      }
 
+   if (g->jump_to_ptr)
+     {
+        _jump_to_ptr(g, g->jump_to_ptr);
+        g->jump_to_ptr = 0;
+     }
+
    return EINA_TRUE;
 }
 
@@ -1287,8 +1295,12 @@ _gl_selected(void *data, Evas_Object *pobj EINA_UNUSED, 
void *event_info)
    Clouseau_Tree_Item *treeit = elm_object_item_data_get(event_info);
    const Elm_Object_Item *parent;
    const Elm_Object_Item *prt = elm_genlist_item_parent_get(event_info);
+
    if (!prt)
-     return;
+     {
+        g->gl_it = NULL;
+        return;
+     }
 
    /* Populate object information, then do highlight */
    if (g->gl_it != event_info)
@@ -1416,6 +1428,13 @@ _bt_clicked(void *data, Evas_Object *obj EINA_UNUSED, 
void *event_info EINA_UNUS
 {
    Gui_Elements *g = data;
 
+   /* If there's a currently selected item, try to reopening it. */
+   if (g->gl_it)
+     {
+        Clouseau_Tree_Item *treeit = elm_object_item_data_get(g->gl_it);
+        g->jump_to_ptr = (treeit) ? (uintptr_t) treeit->ptr : 0;
+     }
+
    /* Close all app-bmp-view windows here and clear mem */
    if (g->sel_app)
      {
@@ -1796,23 +1815,29 @@ _ofl_bt_clicked(void *data,
 }
 
 static void
-_jump_to_entry_activated(void *data,
-      Evas_Object *obj, void *event_info EINA_UNUSED)
+_jump_to_ptr(Gui_Elements *g, uintptr_t ptr)
 {
-   Gui_Elements *g = data;
    tree_data_st *td = (g->sel_app->td) ? g->sel_app->td : NULL;
-   long long unsigned int ptr = strtoul(elm_object_text_get(obj), NULL, 16);
    Eina_List *found = NULL;
 
-   if ((found = _list_tree_item_pointer_find(td->tree, (uintptr_t) ptr)))
+   if (td && (found = _list_tree_item_pointer_find(td->tree, (uintptr_t) ptr)))
      {
-        _load_gui_with_list(g, td->tree);
         _tree_item_show(g->gl, found);
         eina_list_free(found);
      }
 }
 
 static void
+_jump_to_entry_activated(void *data,
+      Evas_Object *obj, void *event_info EINA_UNUSED)
+{
+   Gui_Elements *g = data;
+   long long unsigned int ptr = strtoul(elm_object_text_get(obj), NULL, 16);
+
+   _jump_to_ptr(g, ptr);
+}
+
+static void
 _control_buttons_create(Gui_Elements *g, Evas_Object *win)
 {
    Evas_Object *highlight_check;

--