summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2016-04-10 18:11:02 +0300
committerYakov Goldberg <yakov.g@samsung.com>2016-04-13 17:10:46 +0300
commita72c3290f55687ccef6179c554f2179e5447595c (patch)
treec6a7a97143c01c12ddf76cec719eacb8b203e5cd
parent17135f4e4dfc51a14577aacf541f6dcd7fb2a754 (diff)
Refactoring It_Data
Save Eid* instead of Gui_Widget*
-rw-r--r--src/bin/gui/cbview.c43
-rw-r--r--src/bin/gui/contentview.c2
-rw-r--r--src/bin/gui/descview.c11
-rw-r--r--src/bin/gui/editor.c4
-rw-r--r--src/bin/gui/props_helper.c9
-rw-r--r--src/bin/gui/props_helper.h4
-rw-r--r--src/bin/gui/propview.c7
-rw-r--r--src/bin/gui/simple_propview.c9
8 files changed, 47 insertions, 42 deletions
diff --git a/src/bin/gui/cbview.c b/src/bin/gui/cbview.c
index c702d01..621c142 100644
--- a/src/bin/gui/cbview.c
+++ b/src/bin/gui/cbview.c
@@ -47,7 +47,7 @@ _action_type_changed(void *data, const Eo_Event *event)
47{ 47{
48 It_Data *it_data = data; 48 It_Data *it_data = data;
49 Gui_Widget_Callback *cb = it_data->cb; 49 Gui_Widget_Callback *cb = it_data->cb;
50 Gui_Widget *wdg = (Gui_Widget *) it_data->wdg; 50 Gui_Widget *wdg = wdg_get(it_data->w_eid);
51 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg); 51 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
52 void *event_info = event->event_info; 52 void *event_info = event->event_info;
53 53
@@ -98,7 +98,7 @@ _action_type_changed(void *data, const Eo_Event *event)
98 default: break; 98 default: break;
99 } 99 }
100 100
101 cbview_build(it_data->wdg); 101 cbview_build(wdg_get(it_data->w_eid));
102 cbview_item_selected_set(cb_eid_get(cb)); 102 cbview_item_selected_set(cb_eid_get(cb));
103 context_memento_finalize(ctx); 103 context_memento_finalize(ctx);
104 104
@@ -110,7 +110,7 @@ _action_wdg_selected(void *data, Eo *obj EINA_UNUSED, void *event_info)
110{ 110{
111 It_Data *it_data = data; 111 It_Data *it_data = data;
112 Gui_Widget_Callback *cb = it_data->cb; 112 Gui_Widget_Callback *cb = it_data->cb;
113 Gui_Widget *wdg = (Gui_Widget *) it_data->wdg; 113 Gui_Widget *wdg = wdg_get(it_data->w_eid);
114 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg); 114 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
115 115
116 Eid *action_id = cb_action_id_get(cb); 116 Eid *action_id = cb_action_id_get(cb);
@@ -132,7 +132,7 @@ _action_wdg_selected(void *data, Eo *obj EINA_UNUSED, void *event_info)
132 context_memento_finalize(ctx); 132 context_memento_finalize(ctx);
133 } 133 }
134 134
135 cbview_build(it_data->wdg); 135 cbview_build(wdg_get(it_data->w_eid));
136 cbview_item_selected_set(cb_eid_get(cb)); 136 cbview_item_selected_set(cb_eid_get(cb));
137} 137}
138 138
@@ -141,7 +141,7 @@ _action_parent_selected(void *data, const Eo_Event *event)
141{ 141{
142 It_Data *it_data = data; 142 It_Data *it_data = data;
143 Gui_Widget_Callback *cb = it_data->cb; 143 Gui_Widget_Callback *cb = it_data->cb;
144 Gui_Widget *wdg = (Gui_Widget *) it_data->wdg; 144 Gui_Widget *wdg = wdg_get(it_data->w_eid);
145 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg); 145 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
146 void *event_info = event->event_info; 146 void *event_info = event->event_info;
147 147
@@ -160,7 +160,7 @@ _action_parent_selected(void *data, const Eo_Event *event)
160 context_memento_finalize(ctx); 160 context_memento_finalize(ctx);
161 } 161 }
162 162
163 cbview_build(it_data->wdg); 163 cbview_build(wdg_get(it_data->w_eid));
164 cbview_item_selected_set(cb_eid_get(cb)); 164 cbview_item_selected_set(cb_eid_get(cb));
165 return EO_CALLBACK_CONTINUE; 165 return EO_CALLBACK_CONTINUE;
166} 166}
@@ -170,7 +170,7 @@ _action_user_cb_selected(void *data, const Eo_Event *event)
170{ 170{
171 It_Data *it_data = data; 171 It_Data *it_data = data;
172 Gui_Widget_Callback *cb = it_data->cb; 172 Gui_Widget_Callback *cb = it_data->cb;
173 Gui_Widget *wdg = (Gui_Widget *) it_data->wdg; 173 Gui_Widget *wdg = wdg_get(it_data->w_eid);
174 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg); 174 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
175 175
176 Eid *action_id = cb_action_id_get(cb); 176 Eid *action_id = cb_action_id_get(cb);
@@ -188,7 +188,7 @@ _action_user_cb_selected(void *data, const Eo_Event *event)
188 context_memento_finalize(ctx); 188 context_memento_finalize(ctx);
189 } 189 }
190 190
191 cbview_build(it_data->wdg); 191 cbview_build(wdg_get(it_data->w_eid));
192 cbview_item_selected_set(cb_eid_get(cb)); 192 cbview_item_selected_set(cb_eid_get(cb));
193 return EO_CALLBACK_CONTINUE; 193 return EO_CALLBACK_CONTINUE;
194} 194}
@@ -239,7 +239,7 @@ _action_prop_selected(void *data, const Eo_Event *event)
239 free(_split_ret[0]); 239 free(_split_ret[0]);
240 free(_split_ret); 240 free(_split_ret);
241 241
242 cbview_build(it_data->wdg); 242 cbview_build(wdg_get(it_data->w_eid));
243 cbview_item_selected_set(cb_eid_get(cb)); 243 cbview_item_selected_set(cb_eid_get(cb));
244 context_memento_finalize(_active_context_get()); 244 context_memento_finalize(_active_context_get());
245 } 245 }
@@ -251,7 +251,7 @@ _action_item_selected(void *data, const Eo_Event *event)
251{ 251{
252 It_Data *it_data = data; 252 It_Data *it_data = data;
253 Gui_Widget_Callback *cb = it_data->cb; 253 Gui_Widget_Callback *cb = it_data->cb;
254 Gui_Context *ctx = (Gui_Context *) wdg_context_get(it_data->wdg); 254 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg_get(it_data->w_eid));
255 255
256 Eid *action_id = cb_action_id_get(cb); 256 Eid *action_id = cb_action_id_get(cb);
257 Gui_Action *action = action_get(action_id); 257 Gui_Action *action = action_get(action_id);
@@ -290,7 +290,7 @@ _action_prop_update(void *data, Eo *obj, void *event_info)
290 unsigned int par_idx = (unsigned int) (uintptr_t) data; 290 unsigned int par_idx = (unsigned int) (uintptr_t) data;
291 It_Data *it_data = eo_key_data_get(obj, "cb_it_data"); 291 It_Data *it_data = eo_key_data_get(obj, "cb_it_data");
292 Gui_Widget_Callback *cb = it_data->cb; 292 Gui_Widget_Callback *cb = it_data->cb;
293 Gui_Context *ctx = (Gui_Context *) wdg_context_get(it_data->wdg); 293 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg_get(it_data->w_eid));
294 294
295 Eid *action_id = cb_action_id_get(cb); 295 Eid *action_id = cb_action_id_get(cb);
296 Gui_Action *action = action_get(action_id); 296 Gui_Action *action = action_get(action_id);
@@ -504,6 +504,7 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EIN
504{ 504{
505 It_Data *it_data = data; 505 It_Data *it_data = data;
506 const char *default_val = NULL; 506 const char *default_val = NULL;
507 Gui_Widget *wdg = wdg_get(it_data->w_eid);
507 508
508 // Genlist can call content get without calling delete first 509 // Genlist can call content get without calling delete first
509 // so in that case just return what it already has. 510 // so in that case just return what it already has.
@@ -554,18 +555,18 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EIN
554 elm_obj_hoversel_clear(wdgs->cb_wdgs_hsel); 555 elm_obj_hoversel_clear(wdgs->cb_wdgs_hsel);
555 if (atype == CREATION_ACTION) 556 if (atype == CREATION_ACTION)
556 { 557 {
557 Eo *objects_hs = props_hoversel_objects_add(wdgs->cb_item, wdgs->cb_wdgs_hsel, elm_widget_top_get(cb_list), wdg_name, gui_context_main_widgets_get(wdg_context_get(it_data->wdg)), NULL); 558 Eo *objects_hs = props_hoversel_objects_add(wdgs->cb_item, wdgs->cb_wdgs_hsel, elm_widget_top_get(cb_list), wdg_name, gui_context_main_widgets_get(wdg_context_get(wdg)), NULL);
558 elm_object_tooltip_text_set(objects_hs, "Object to create"); 559 elm_object_tooltip_text_set(objects_hs, "Object to create");
559 Eid *parent_id = action_creation_parent_get(action); 560 Eid *parent_id = action_creation_parent_get(action);
560 const char *parent_name = (parent_id ? eid_name_get(parent_id) : NULL); 561 const char *parent_name = (parent_id ? eid_name_get(parent_id) : NULL);
561 Eo *parents_hs = props_hoversel_objects_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), parent_name, gui_context_wdg_list_get(wdg_context_get(it_data->wdg)), NULL); 562 Eo *parents_hs = props_hoversel_objects_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), parent_name, gui_context_wdg_list_get(wdg_context_get(wdg)), NULL);
562 eo_event_callback_add(parents_hs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_parent_selected, it_data); 563 eo_event_callback_add(parents_hs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_parent_selected, it_data);
563 elm_object_tooltip_text_set(parents_hs, "Parent"); 564 elm_object_tooltip_text_set(parents_hs, "Parent");
564 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, parents_hs); 565 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, parents_hs);
565 } 566 }
566 else 567 else
567 { 568 {
568 Eo *user_cb_hs = props_hoversel_objects_add(wdgs->cb_item, wdgs->cb_wdgs_hsel, elm_widget_top_get(cb_list), wdg_name, gui_context_wdg_list_get(wdg_context_get(it_data->wdg)), NULL); 569 Eo *user_cb_hs = props_hoversel_objects_add(wdgs->cb_item, wdgs->cb_wdgs_hsel, elm_widget_top_get(cb_list), wdg_name, gui_context_wdg_list_get(wdg_context_get(wdg)), NULL);
569 elm_object_tooltip_text_set(user_cb_hs, "Object to modify"); 570 elm_object_tooltip_text_set(user_cb_hs, "Object to modify");
570 } 571 }
571 evas_object_smart_callback_add(wdgs->cb_wdgs_hsel, "selected", _action_wdg_selected, it_data); 572 evas_object_smart_callback_add(wdgs->cb_wdgs_hsel, "selected", _action_wdg_selected, it_data);
@@ -573,8 +574,8 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EIN
573 if (atype == MODIF_ACTION) 574 if (atype == MODIF_ACTION)
574 { 575 {
575 Eid *wdg_id = action_widget_id_get(action); 576 Eid *wdg_id = action_widget_id_get(action);
576 Gui_Widget *wdg = wdg_get(wdg_id); 577 Gui_Widget *wdg_tmp = wdg_get(wdg_id);
577 Eo *props_hover = props_hoversel_object_ops_add(wdgs->cb_item, elm_widget_top_get(cb_list), " --- ", wdg); 578 Eo *props_hover = props_hoversel_object_ops_add(wdgs->cb_item, elm_widget_top_get(cb_list), " --- ", wdg_tmp);
578 elm_object_tooltip_text_set(props_hover, "Property to modify"); 579 elm_object_tooltip_text_set(props_hover, "Property to modify");
579 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, props_hover); 580 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, props_hover);
580 eo_event_callback_add(props_hover, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_prop_selected, it_data); 581 eo_event_callback_add(props_hover, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_prop_selected, it_data);
@@ -591,7 +592,7 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EIN
591 Gui_Value *val = prop_value_nth_get(prop, 0); 592 Gui_Value *val = prop_value_nth_get(prop, 0);
592 if (val) 593 if (val)
593 { 594 {
594 const Eina_List *items_list = item_container_item_subitems_get(wdg_item_container_root_get(wdg)); 595 const Eina_List *items_list = item_container_item_subitems_get(wdg_item_container_root_get(wdg_tmp));
595 Eid *cur_item = EID_ID_GET(val); 596 Eid *cur_item = EID_ID_GET(val);
596 const char *cur_item_name = eid_name_get(cur_item)?:" --- "; 597 const char *cur_item_name = eid_name_get(cur_item)?:" --- ";
597 Eo *items_hover = props_hoversel_objects_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), cur_item_name, items_list, NULL); 598 Eo *items_hover = props_hoversel_objects_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), cur_item_name, items_list, NULL);
@@ -608,7 +609,7 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EIN
608 { 609 {
609 void *pi = (void *) (uintptr_t) i; 610 void *pi = (void *) (uintptr_t) i;
610 Gui_Value *value = ((prop && prop_value_get(prop)) ? prop_value_nth_get(prop, i) : NULL); 611 Gui_Value *value = ((prop && prop_value_get(prop)) ? prop_value_nth_get(prop, i) : NULL);
611 Eo *new_obj = props_value_add(wdgs->cb_item, wdg, value, op, i); 612 Eo *new_obj = props_value_add(wdgs->cb_item, wdg_tmp, value, op, i);
612 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, new_obj); 613 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, new_obj);
613 if (new_obj) 614 if (new_obj)
614 { 615 {
@@ -630,7 +631,7 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EIN
630 { 631 {
631 Eid *cb_id = action_user_cb_id_get(action); 632 Eid *cb_id = action_user_cb_id_get(action);
632 const char *cb_name = (cb_id ? eid_name_get(cb_id) : NULL); 633 const char *cb_name = (cb_id ? eid_name_get(cb_id) : NULL);
633 Eo *cbs_hs = props_hoversel_resources_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), cb_name, wdg_context_get(it_data->wdg), RESOURCE_EO_CALLBACK); 634 Eo *cbs_hs = props_hoversel_resources_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), cb_name, wdg_context_get(wdg), RESOURCE_EO_CALLBACK);
634 eo_event_callback_add(cbs_hs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_user_cb_selected, it_data); 635 eo_event_callback_add(cbs_hs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_user_cb_selected, it_data);
635 elm_object_tooltip_text_set(cbs_hs, "User callback"); 636 elm_object_tooltip_text_set(cbs_hs, "User callback");
636 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, cbs_hs); 637 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, cbs_hs);
@@ -713,7 +714,7 @@ _selected_callback_move(int dir)
713 Callback_Container *cc_new; 714 Callback_Container *cc_new;
714 715
715 Gui_Widget_Callback *cb = it_data->cb; 716 Gui_Widget_Callback *cb = it_data->cb;
716 const Gui_Widget *wdg = it_data->wdg; 717 Gui_Widget *wdg = wdg_get(it_data->w_eid);
717 cc_old = wdg_cb_container_get(wdg); 718 cc_old = wdg_cb_container_get(wdg);
718 cc_new = cb_container_copy(cc_old); 719 cc_new = cb_container_copy(cc_old);
719 if (cb_container_cb_move(cc_new, cb, dir)) 720 if (cb_container_cb_move(cc_new, cb, dir))
@@ -764,7 +765,7 @@ _callbacksview_del_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, cons
764 Callback_Container *cc_new; 765 Callback_Container *cc_new;
765 766
766 Gui_Widget_Callback *cb = it_data->cb; 767 Gui_Widget_Callback *cb = it_data->cb;
767 const Gui_Widget *wdg = it_data->wdg; 768 Gui_Widget *wdg = wdg_get(it_data->w_eid);
768 cc_old = wdg_cb_container_get(wdg); 769 cc_old = wdg_cb_container_get(wdg);
769 cc_new = cb_container_copy(cc_old); 770 cc_new = cb_container_copy(cc_old);
770 cb_container_cb_remove(cc_new, cb); 771 cb_container_cb_remove(cc_new, cb);
diff --git a/src/bin/gui/contentview.c b/src/bin/gui/contentview.c
index 98fb67e..58e8eb5 100644
--- a/src/bin/gui/contentview.c
+++ b/src/bin/gui/contentview.c
@@ -33,7 +33,7 @@ _pfd_free_cb(void *pfd, const Eo_Event *event EINA_UNUSED)
33static Evas_Object * 33static Evas_Object *
34_content_item_content_get(It_Data *it_data) 34_content_item_content_get(It_Data *it_data)
35{ 35{
36 const Gui_Widget *wdg = it_data->wdg; 36 const Gui_Widget *wdg = wdg_get(it_data->w_eid);
37 37
38 unsigned int count, i; 38 unsigned int count, i;
39 count = db_op_desc_param_number_get(it_data->op_desc); 39 count = db_op_desc_param_number_get(it_data->op_desc);
diff --git a/src/bin/gui/descview.c b/src/bin/gui/descview.c
index 4c70e2c..ba33d28 100644
--- a/src/bin/gui/descview.c
+++ b/src/bin/gui/descview.c
@@ -70,6 +70,7 @@ static Evas_Object *
70_description_item_content_get(It_Data *it_data) 70_description_item_content_get(It_Data *it_data)
71{ 71{
72 Evas_Object *box = eo_add(ELM_BOX_CLASS, desc_list); 72 Evas_Object *box = eo_add(ELM_BOX_CLASS, desc_list);
73 const Gui_Widget *wdg = wdg_get(it_data->w_eid);
73 efl_gfx_visible_set(box, EINA_TRUE); 74 efl_gfx_visible_set(box, EINA_TRUE);
74 elm_obj_box_horizontal_set(box, EINA_TRUE); 75 elm_obj_box_horizontal_set(box, EINA_TRUE);
75 elm_obj_box_padding_set(box, 5, 0); 76 elm_obj_box_padding_set(box, 5, 0);
@@ -85,20 +86,20 @@ _description_item_content_get(It_Data *it_data)
85 86
86 if (!strcmp(it_data->desc, DB_DEF_PUBLIC)) 87 if (!strcmp(it_data->desc, DB_DEF_PUBLIC))
87 { 88 {
88 Eo *ck = props_toggle_add(box, wdg_public_get(it_data->wdg)); 89 Eo *ck = props_toggle_add(box, wdg_public_get(wdg));
89 eo_event_callback_add(ck, ELM_CHECK_EVENT_CHANGED, _wdg_public_change_cb, it_data->wdg); 90 eo_event_callback_add(ck, ELM_CHECK_EVENT_CHANGED, _wdg_public_change_cb, wdg);
90 elm_object_tooltip_text_set(ck, "Check to make widget accissible from code"); 91 elm_object_tooltip_text_set(ck, "Check to make widget accissible from code");
91 } 92 }
92 else if (!strcmp(it_data->desc, DB_DEF_NAME)) 93 else if (!strcmp(it_data->desc, DB_DEF_NAME))
93 { 94 {
94 Eo *entry = props_entry_add(box, wdg_name_get(it_data->wdg), GUI_TYPE_STRING); 95 Eo *entry = props_entry_add(box, wdg_name_get(wdg), GUI_TYPE_STRING);
95 eo_event_callback_add(entry, ELM_ENTRY_EVENT_ACTIVATED, _wdg_name_change_cb, it_data->wdg); 96 eo_event_callback_add(entry, ELM_ENTRY_EVENT_ACTIVATED, _wdg_name_change_cb, wdg);
96 prop_memo_bubble_add(entry, "Press Enter to apply changes"); 97 prop_memo_bubble_add(entry, "Press Enter to apply changes");
97 elm_object_tooltip_text_set(entry, "Widget name"); 98 elm_object_tooltip_text_set(entry, "Widget name");
98 } 99 }
99 else if (!strcmp(it_data->desc, DB_DEF_CLASS)) 100 else if (!strcmp(it_data->desc, DB_DEF_CLASS))
100 { 101 {
101 Eo *entry = props_entry_add(box, wdg_class_name_get(it_data->wdg), GUI_TYPE_STRING); 102 Eo *entry = props_entry_add(box, wdg_class_name_get(wdg), GUI_TYPE_STRING);
102 elm_object_disabled_set(entry, EINA_TRUE); 103 elm_object_disabled_set(entry, EINA_TRUE);
103 elm_object_tooltip_text_set(entry, "Widget class"); 104 elm_object_tooltip_text_set(entry, "Widget class");
104 } 105 }
diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index f7e1107..93b0d83 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -3459,7 +3459,7 @@ _prop_update_from_propview_int(void *data EINA_UNUSED, Eo *obj, const Eo_Event_D
3459 if (!op) 3459 if (!op)
3460 op = original_op_desc_get(pfd->it_data->orig_op_desc); 3460 op = original_op_desc_get(pfd->it_data->orig_op_desc);
3461 3461
3462 wdg = pfd->it_data->wdg; 3462 wdg = wdg_get(pfd->it_data->w_eid);
3463 prop = (Gui_Widget_Property *)pfd->it_data->prop; 3463 prop = (Gui_Widget_Property *)pfd->it_data->prop;
3464 idx = pfd->par_idx; 3464 idx = pfd->par_idx;
3465 /* propdata box, change its color then value changed from default. */ 3465 /* propdata box, change its color then value changed from default. */
@@ -4171,7 +4171,7 @@ _content_change_from_propview(void *data EINA_UNUSED, const Eo_Event *event)
4171 /* Get data for changed field. */ 4171 /* Get data for changed field. */
4172 pfd = eo_key_data_get(event->obj, _STR_EDITOR); 4172 pfd = eo_key_data_get(event->obj, _STR_EDITOR);
4173 4173
4174 const Gui_Widget *wdg = pfd->it_data->wdg; 4174 const Gui_Widget *wdg = wdg_get(pfd->it_data->w_eid);
4175 int par_idx = pfd->par_idx; 4175 int par_idx = pfd->par_idx;
4176 Gui_Value *val = NULL; 4176 Gui_Value *val = NULL;
4177 Gui_Type type = GUI_TYPE_NONE; 4177 Gui_Type type = GUI_TYPE_NONE;
diff --git a/src/bin/gui/props_helper.c b/src/bin/gui/props_helper.c
index 297e51e..dc2eb0a 100644
--- a/src/bin/gui/props_helper.c
+++ b/src/bin/gui/props_helper.c
@@ -44,6 +44,7 @@ void
44_prop_field_update(const Gui_Widget_Property *prop, Eo *item_box, It_Data *it_data) 44_prop_field_update(const Gui_Widget_Property *prop, Eo *item_box, It_Data *it_data)
45{ 45{
46 Eina_List *box_list, *box_list_itr, *par_list, *l; 46 Eina_List *box_list, *box_list_itr, *par_list, *l;
47 Gui_Widget *wdg = wdg_get(it_data->w_eid);
47 Gui_Value *val; 48 Gui_Value *val;
48 int i = 0; 49 int i = 0;
49 50
@@ -106,8 +107,8 @@ _prop_field_update(const Gui_Widget_Property *prop, Eo *item_box, It_Data *it_da
106 case GUI_TYPE_FILE: 107 case GUI_TYPE_FILE:
107 { 108 {
108 elm_obj_hoversel_clear(o); 109 elm_obj_hoversel_clear(o);
109 props_hoversel_resources_add(NULL, o, NULL, NULL, wdg_context_get(it_data->wdg), RESOURCE_IMAGE); 110 props_hoversel_resources_add(NULL, o, NULL, NULL, wdg_context_get(wdg), RESOURCE_IMAGE);
110 props_hoversel_resources_add(NULL, o, NULL, NULL, wdg_context_get(it_data->wdg), RESOURCE_EDJE); 111 props_hoversel_resources_add(NULL, o, NULL, NULL, wdg_context_get(wdg), RESOURCE_EDJE);
111 112
112 Eid *eid = EID_ID_GET(prop_value_nth_get(prop, i)); 113 Eid *eid = EID_ID_GET(prop_value_nth_get(prop, i));
113 const char *default_str = PROP_HOVERSEL_NONE_VALUE; 114 const char *default_str = PROP_HOVERSEL_NONE_VALUE;
@@ -127,7 +128,7 @@ _prop_field_update(const Gui_Widget_Property *prop, Eo *item_box, It_Data *it_da
127 case GUI_TYPE_THEME: 128 case GUI_TYPE_THEME:
128 { 129 {
129 elm_obj_hoversel_clear(o); 130 elm_obj_hoversel_clear(o);
130 props_hoversel_resources_add(NULL, o, NULL, NULL, wdg_context_get(it_data->wdg), RESOURCE_THEME); 131 props_hoversel_resources_add(NULL, o, NULL, NULL, wdg_context_get(wdg), RESOURCE_THEME);
131 132
132 Eid *eid = EID_ID_GET(prop_value_nth_get(prop, i)); 133 Eid *eid = EID_ID_GET(prop_value_nth_get(prop, i));
133 const char *default_str = PROP_HOVERSEL_NONE_VALUE; 134 const char *default_str = PROP_HOVERSEL_NONE_VALUE;
@@ -147,7 +148,7 @@ _prop_field_update(const Gui_Widget_Property *prop, Eo *item_box, It_Data *it_da
147 case GUI_TYPE_OBJECT: 148 case GUI_TYPE_OBJECT:
148 { 149 {
149 elm_obj_hoversel_clear(o); 150 elm_obj_hoversel_clear(o);
150 props_hoversel_objects_add(NULL, o, NULL, NULL, gui_context_wdg_list_get(wdg_context_get(it_data->wdg)), it_data->wdg); 151 props_hoversel_objects_add(NULL, o, NULL, NULL, gui_context_wdg_list_get(wdg_context_get(wdg)), wdg);
151 Eid *eid = EID_ID_GET(prop_value_nth_get(prop, i)); 152 Eid *eid = EID_ID_GET(prop_value_nth_get(prop, i));
152 const char *default_str = PROP_HOVERSEL_NONE_VALUE; 153 const char *default_str = PROP_HOVERSEL_NONE_VALUE;
153 if (IS_ID_VALID(eid)) 154 if (IS_ID_VALID(eid))
diff --git a/src/bin/gui/props_helper.h b/src/bin/gui/props_helper.h
index ba22775..b23d57b 100644
--- a/src/bin/gui/props_helper.h
+++ b/src/bin/gui/props_helper.h
@@ -20,7 +20,7 @@
20 }\ 20 }\
21 else \ 21 else \
22 { \ 22 { \
23 _it->wdg = (Gui_Widget *)(wi); \ 23 _it->w_eid = wdg_eid_get((Gui_Widget *)(wi)); \
24 }\ 24 }\
25 _it; \ 25 _it; \
26 }) 26 })
@@ -44,7 +44,7 @@ typedef struct
44 It_Data_Type type; 44 It_Data_Type type;
45 union 45 union
46 { 46 {
47 const Gui_Widget *wdg; 47 Eid *w_eid;
48 const Item_Container_Item *item; 48 const Item_Container_Item *item;
49 }; 49 };
50 union 50 union
diff --git a/src/bin/gui/propview.c b/src/bin/gui/propview.c
index 0a66301..c014112 100644
--- a/src/bin/gui/propview.c
+++ b/src/bin/gui/propview.c
@@ -87,7 +87,7 @@ _property_item_content_get(It_Data *it_data)
87 /* Get value, for which we want to build field. 87 /* Get value, for which we want to build field.
88 * If it is NULL, field will be build, for nth value in Op_Desc*/ 88 * If it is NULL, field will be build, for nth value in Op_Desc*/
89 Gui_Value *value = ((prop && prop_value_get(prop)) ? prop_value_nth_get(prop, i) : NULL); 89 Gui_Value *value = ((prop && prop_value_get(prop)) ? prop_value_nth_get(prop, i) : NULL);
90 Eo *obj = props_value_add(box, it_data->wdg, value, op, i); 90 Eo *obj = props_value_add(box, wdg_get(it_data->w_eid), value, op, i);
91 if (obj) 91 if (obj)
92 { 92 {
93 Par_Field_Data *pfd = calloc (1, sizeof(Par_Field_Data)); 93 Par_Field_Data *pfd = calloc (1, sizeof(Par_Field_Data));
@@ -141,6 +141,7 @@ static Evas_Object *
141_prop_item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) 141_prop_item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED)
142{ 142{
143 It_Data *it_data = data; 143 It_Data *it_data = data;
144 Gui_Widget *wdg = wdg_get(it_data->w_eid);
144 145
145 if (it_data->box) return it_data->box; 146 if (it_data->box) return it_data->box;
146 147
@@ -155,7 +156,7 @@ _prop_item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *par
155 /* Check if get function is implemented for this property. */ 156 /* Check if get function is implemented for this property. */
156 Eolian_Function_Type func_type = db_op_desc_type_get(it_data->op_desc); 157 Eolian_Function_Type func_type = db_op_desc_type_get(it_data->op_desc);
157 const Eolian_Class *f_klass = eolian_class_get_by_name(db_op_desc_class_name_get(it_data->op_desc)); 158 const Eolian_Class *f_klass = eolian_class_get_by_name(db_op_desc_class_name_get(it_data->op_desc));
158 const Eolian_Class *w_klass = eolian_class_get_by_name(wdg_class_name_get(it_data->wdg)); 159 const Eolian_Class *w_klass = eolian_class_get_by_name(wdg_class_name_get(wdg));
159 160
160 const char *func_name = db_op_desc_op_name_get(it_data->op_desc); 161 const char *func_name = db_op_desc_op_name_get(it_data->op_desc);
161 162
@@ -163,7 +164,7 @@ _prop_item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *par
163 Eina_Bool ret = eolian_function_is_implemented(func_id, func_type, w_klass); 164 Eina_Bool ret = eolian_function_is_implemented(func_id, func_type, w_klass);
164 if (ret) 165 if (ret)
165 { 166 {
166 manager_widget_property_get(session, it_data->wdg, it_data->prop); 167 manager_widget_property_get(session, wdg, it_data->prop);
167 } 168 }
168 else 169 else
169 { 170 {
diff --git a/src/bin/gui/simple_propview.c b/src/bin/gui/simple_propview.c
index 89e40ed..84be60b 100644
--- a/src/bin/gui/simple_propview.c
+++ b/src/bin/gui/simple_propview.c
@@ -139,7 +139,7 @@ _color_change_popup_cb(Popup_Button_Type button_type, void *data)
139 efl_gfx_color_set(pcd->button, pcd->r, pcd->g, pcd->b, pcd->a); 139 efl_gfx_color_set(pcd->button, pcd->r, pcd->g, pcd->b, pcd->a);
140 It_Data *it_data = pcd->it_data; 140 It_Data *it_data = pcd->it_data;
141 141
142 const Gui_Widget *wdg = it_data->wdg; 142 const Gui_Widget *wdg = wdg_get(it_data->w_eid);
143 Gui_Widget_Property *prop = NULL, *old_property = NULL; 143 Gui_Widget_Property *prop = NULL, *old_property = NULL;
144 Gui_Value *val = NULL; 144 Gui_Value *val = NULL;
145 Gui_Context *ctx = _active_context_get(); 145 Gui_Context *ctx = _active_context_get();
@@ -333,7 +333,7 @@ _property_item_content_get(Eo *box, It_Data *it_data, const char *name)
333 continue; 333 continue;
334 } 334 }
335 } 335 }
336 Eo *obj = props_value_add(box, it_data->wdg, value, op, i); 336 Eo *obj = props_value_add(box, wdg_get(it_data->w_eid), value, op, i);
337 if (obj) 337 if (obj)
338 { 338 {
339 Par_Field_Data *pfd = calloc (1, sizeof(Par_Field_Data)); 339 Par_Field_Data *pfd = calloc (1, sizeof(Par_Field_Data));
@@ -389,6 +389,7 @@ _simple_prop_item_content_get(It_Data *data, const char *simple_op_name)
389 389
390 if (!it_data->prop) 390 if (!it_data->prop)
391 { 391 {
392 Gui_Widget *wdg = wdg_get(it_data->w_eid);
392 it_data->prop = prop_create_for_op(op_desc); 393 it_data->prop = prop_create_for_op(op_desc);
393 const Gui_Context *ctx = _active_context_get(); 394 const Gui_Context *ctx = _active_context_get();
394 Gui_Session *session = (Gui_Session *) gui_context_editor_session_get(ctx); 395 Gui_Session *session = (Gui_Session *) gui_context_editor_session_get(ctx);
@@ -396,7 +397,7 @@ _simple_prop_item_content_get(It_Data *data, const char *simple_op_name)
396 /* Check if get function is implemented for this property. */ 397 /* Check if get function is implemented for this property. */
397 Eolian_Function_Type func_type = db_op_desc_type_get(op_desc); 398 Eolian_Function_Type func_type = db_op_desc_type_get(op_desc);
398 const Eolian_Class *f_klass = eolian_class_get_by_name(db_op_desc_class_name_get(op_desc)); 399 const Eolian_Class *f_klass = eolian_class_get_by_name(db_op_desc_class_name_get(op_desc));
399 const Eolian_Class *w_klass = eolian_class_get_by_name(wdg_class_name_get(it_data->wdg)); 400 const Eolian_Class *w_klass = eolian_class_get_by_name(wdg_class_name_get(wdg));
400 401
401 const char *func_name = db_op_desc_op_name_get(op_desc); 402 const char *func_name = db_op_desc_op_name_get(op_desc);
402 403
@@ -404,7 +405,7 @@ _simple_prop_item_content_get(It_Data *data, const char *simple_op_name)
404 Eina_Bool ret = eolian_function_is_implemented(func_id, func_type, w_klass); 405 Eina_Bool ret = eolian_function_is_implemented(func_id, func_type, w_klass);
405 if (ret) 406 if (ret)
406 { 407 {
407 manager_widget_property_get(session, it_data->wdg, it_data->prop); 408 manager_widget_property_get(session, wdg, it_data->prop);
408 } 409 }
409 else 410 else
410 { 411 {