summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2016-01-07 14:26:05 +0200
committerYakov Goldberg <yakov.g@samsung.com>2016-01-07 16:26:09 +0200
commiteb1f96c33992f1909a3ff4ed846b4e5407b457e6 (patch)
tree70e872c7ec7ff7009a0509fff1cc20bd8f6d888f
parent6ee60da2865e6d3577cc384e92baf0e9134c252b (diff)
Move objtree, propview and factory packing code after project openning
Genlist and scroller objects cause multiple smart object recalculations when paking code is called before project openning.
-rw-r--r--src/bin/gui/egui_layout.json19
-rw-r--r--src/bin/gui/egui_logic.c7
2 files changed, 14 insertions, 12 deletions
diff --git a/src/bin/gui/egui_layout.json b/src/bin/gui/egui_layout.json
index b0c90f1..3fe4065 100644
--- a/src/bin/gui/egui_layout.json
+++ b/src/bin/gui/egui_layout.json
@@ -1139,14 +1139,15 @@
1139 "Evas.Object.size_hint_align":[-1, -1], 1139 "Evas.Object.size_hint_align":[-1, -1],
1140 "Efl.Gfx.Base.visible":[true] 1140 "Efl.Gfx.Base.visible":[true]
1141 }, 1141 },
1142 "Contains":["theme_selector_box", "fctr_scroll"] 1142 "Contains":["theme_selector_box"]
1143 }, 1143 },
1144 "fctr_scroll": 1144 "fctr_scroll":
1145 { 1145 {
1146 "Desc": 1146 "Desc":
1147 { 1147 {
1148 "parent":"left_panel_box", 1148 "parent":"left_panel_box",
1149 "class":"Elm.Scroller" 1149 "class":"Elm.Scroller",
1150 "public":true
1150 }, 1151 },
1151 "Properties": 1152 "Properties":
1152 { 1153 {
@@ -1578,8 +1579,8 @@
1578 }, 1579 },
1579 "Contains": 1580 "Contains":
1580 { 1581 {
1581 "objtree_table":["left"], 1582 "propsview_table":["right"],
1582 "propsview_table":["right"] 1583 "objtree_table":["left"]
1583 } 1584 }
1584 }, 1585 },
1585 "objtree_table": 1586 "objtree_table":
@@ -1598,8 +1599,7 @@
1598 }, 1599 },
1599 "Contains": 1600 "Contains":
1600 { 1601 {
1601 "objtree_filter_box":[0, 0, 1, 1], 1602 "objtree_filter_box":[0, 0, 1, 1]
1602 "objtree_list":[0, 1, 1, 1]
1603 } 1603 }
1604 }, 1604 },
1605 "objtree_list": 1605 "objtree_list":
@@ -1685,12 +1685,7 @@
1685 "Contains": 1685 "Contains":
1686 { 1686 {
1687 "propsview_toolbar":[0, 0, 1, 1], 1687 "propsview_toolbar":[0, 0, 1, 1],
1688 "propsview_filter_box":[0, 1, 1, 1], 1688 "propsview_filter_box":[0, 1, 1, 1]
1689 "description_list":[0, 2, 1, 1],
1690 "properties_list":[0, 2, 1, 1],
1691 "callbacksview_box":[0, 2, 1, 1],
1692 "itemview_box":[0, 2, 1, 1],
1693 "contentview_box":[0, 2, 1, 1]
1694 } 1689 }
1695 }, 1690 },
1696 "propsview_filter_box": 1691 "propsview_filter_box":
diff --git a/src/bin/gui/egui_logic.c b/src/bin/gui/egui_logic.c
index f3b4f92..ccb8acf 100644
--- a/src/bin/gui/egui_logic.c
+++ b/src/bin/gui/egui_logic.c
@@ -1139,6 +1139,13 @@ egui_start(const char *filename)
1139 /*FIXME: Need to unpack inline image, so pass it into delete callback*/ 1139 /*FIXME: Need to unpack inline image, so pass it into delete callback*/
1140 evas_object_smart_callback_add(g_main_wdgs->main_win->main_win, "delete,request", _main_win_del_cb, NULL); 1140 evas_object_smart_callback_add(g_main_wdgs->main_win->main_win, "delete,request", _main_win_del_cb, NULL);
1141 _egui_project_open(filename); 1141 _egui_project_open(filename);
1142 eo_do(g_main_wdgs->main_win->objtree_table, elm_obj_table_pack(g_main_wdgs->main_win->objtree_list, 0, 1, 1, 1));
1143 eo_do(g_main_wdgs->main_win->propsview_table, elm_obj_table_pack(g_main_wdgs->main_win->description_list, 0, 2, 1, 1));
1144 eo_do(g_main_wdgs->main_win->propsview_table, elm_obj_table_pack(g_main_wdgs->main_win->properties_list, 0, 2, 1, 1));
1145 eo_do(g_main_wdgs->main_win->propsview_table, elm_obj_table_pack(g_main_wdgs->main_win->callbacksview_box, 0, 2, 1, 1));
1146 eo_do(g_main_wdgs->main_win->propsview_table, elm_obj_table_pack(g_main_wdgs->main_win->itemview_box, 0, 2, 1, 1));
1147 eo_do(g_main_wdgs->main_win->propsview_table, elm_obj_table_pack(g_main_wdgs->main_win->contentview_box, 0, 2, 1, 1));
1148 eo_do(g_main_wdgs->main_win->left_panel_box, elm_obj_box_pack_end(g_main_wdgs->main_win->fctr_scroll));
1142} 1149}
1143 1150
1144void 1151void