summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYossi Kantor <yossi.kantor@samsung.com>2014-10-28 13:32:45 +0200
committerYossi Kantor <yossi.kantor@samsung.com>2014-10-28 15:30:08 +0200
commit0ef95bff61721d2257fb223b1a4b7463800704ed (patch)
tree3a2ac7b203e81f002d08cdbab72bda09b7b8f3a2
parenteb64230d982c2e11658fbb729782d9bfaac6d242 (diff)
Objtree init and shudown as in proplayout
-rw-r--r--src/bin/egui_gui/editor.c4
-rw-r--r--src/bin/egui_gui/objtree.c9
-rw-r--r--src/bin/egui_gui/objtree.h4
3 files changed, 10 insertions, 7 deletions
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index 5965cb4..dadc288 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -1726,7 +1726,7 @@ editor_shutdown()
1726 target_db_shutdown(); 1726 target_db_shutdown();
1727 seqview_shutdown(); 1727 seqview_shutdown();
1728 proplayout_shutdown(); 1728 proplayout_shutdown();
1729 objtree_list_unset(); 1729 objtree_shutdown();
1730 1730
1731 void *p = (void *) propview_cbs_get(); 1731 void *p = (void *) propview_cbs_get();
1732 free(p); 1732 free(p);
@@ -2795,7 +2795,7 @@ editor_init(GuiLogicCbs *_guilogic_cbs)
2795 _guilogic_cbs->_project_close = _project_close; 2795 _guilogic_cbs->_project_close = _project_close;
2796 _guilogic_cbs->_project_new = _project_new; 2796 _guilogic_cbs->_project_new = _project_new;
2797 2797
2798 objtree_list_set(g->main_win->objtree_list); 2798 objtree_init();
2799 proplayout_init(); 2799 proplayout_init();
2800 seqview_init(g->main_win->seq_list); 2800 seqview_init(g->main_win->seq_list);
2801 target_db_init(); 2801 target_db_init();
diff --git a/src/bin/egui_gui/objtree.c b/src/bin/egui_gui/objtree.c
index aca8a9a..0b759c9 100644
--- a/src/bin/egui_gui/objtree.c
+++ b/src/bin/egui_gui/objtree.c
@@ -2,6 +2,7 @@
2#include <Elementary.h> 2#include <Elementary.h>
3#include "egui_log.h" 3#include "egui_log.h"
4#include "objtree.h" 4#include "objtree.h"
5#include "egui_layout.h"
5 6
6static Eo *lst = NULL; 7static Eo *lst = NULL;
7static const Gui_Context *active_ctx = NULL; 8static const Gui_Context *active_ctx = NULL;
@@ -131,9 +132,11 @@ ObjTreeViewCbs *objtree_cbs_get()
131* (Assign place where logical list will be displayed.) 132* (Assign place where logical list will be displayed.)
132 * */ 133 * */
133void 134void
134objtree_list_set(Eo *visible_list) 135objtree_init()
135{ 136{
136 lst = visible_list; 137 Egui_Layout_Widgets *g = egui_layout_gui_get();
138 lst = g->main_win->objtree_list;
139
137 if (!_itc) 140 if (!_itc)
138 { 141 {
139 _itc = elm_genlist_item_class_new(); 142 _itc = elm_genlist_item_class_new();
@@ -161,7 +164,7 @@ objtree_list_set(Eo *visible_list)
161} 164}
162 165
163void 166void
164objtree_list_unset() 167objtree_shutdown()
165{ 168{
166 if (_widgets_to_items_hash_table) eina_hash_free(_widgets_to_items_hash_table); 169 if (_widgets_to_items_hash_table) eina_hash_free(_widgets_to_items_hash_table);
167 _widgets_to_items_hash_table = NULL; 170 _widgets_to_items_hash_table = NULL;
diff --git a/src/bin/egui_gui/objtree.h b/src/bin/egui_gui/objtree.h
index 5b1d5d9..df9783b 100644
--- a/src/bin/egui_gui/objtree.h
+++ b/src/bin/egui_gui/objtree.h
@@ -18,10 +18,10 @@ objtree_cbs_get();
18* (Assign place where logical list will be displayed.) 18* (Assign place where logical list will be displayed.)
19* */ 19* */
20void 20void
21objtree_list_set(Eo *list); 21objtree_init();
22 22
23void 23void
24objtree_list_unset(); 24objtree_shutdown();
25 25
26/* Assign context to objtree view. 26/* Assign context to objtree view.
27 * Set active context for objtree view. */ 27 * Set active context for objtree view. */