yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=eb1f96c33992f1909a3ff4ed846b4e5407b457e6

commit eb1f96c33992f1909a3ff4ed846b4e5407b457e6
Author: Yakov Goldberg <yako...@samsung.com>
Date:   Thu Jan 7 14:26:05 2016 +0200

    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.
---
 src/bin/gui/egui_layout.json | 19 +++++++------------
 src/bin/gui/egui_logic.c     |  7 +++++++
 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 @@
             "Evas.Object.size_hint_align":[-1, -1],
             "Efl.Gfx.Base.visible":[true]
          },
-         "Contains":["theme_selector_box", "fctr_scroll"]
+         "Contains":["theme_selector_box"]
       },
       "fctr_scroll":
       {
          "Desc":
          {
             "parent":"left_panel_box",
-            "class":"Elm.Scroller"
+            "class":"Elm.Scroller",
+            "public":true
          },
          "Properties":
          {
@@ -1578,8 +1579,8 @@
          },
          "Contains":
          {
-            "objtree_table":["left"],
-            "propsview_table":["right"]
+            "propsview_table":["right"],
+            "objtree_table":["left"]
          }
       },
       "objtree_table":
@@ -1598,8 +1599,7 @@
          },
          "Contains":
          {
-            "objtree_filter_box":[0, 0, 1, 1],
-            "objtree_list":[0, 1, 1, 1]
+            "objtree_filter_box":[0, 0, 1, 1]
          }
       },
       "objtree_list":
@@ -1685,12 +1685,7 @@
          "Contains":
          {
             "propsview_toolbar":[0, 0, 1, 1],
-            "propsview_filter_box":[0, 1, 1, 1],
-            "description_list":[0, 2, 1, 1],
-            "properties_list":[0, 2, 1, 1],
-            "callbacksview_box":[0, 2, 1, 1],
-            "itemview_box":[0, 2, 1, 1],
-            "contentview_box":[0, 2, 1, 1]
+            "propsview_filter_box":[0, 1, 1, 1]
          }
       },
       "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)
    /*FIXME: Need to unpack inline image, so pass it into delete callback*/
    evas_object_smart_callback_add(g_main_wdgs->main_win->main_win, 
"delete,request", _main_win_del_cb, NULL);
    _egui_project_open(filename);
+   eo_do(g_main_wdgs->main_win->objtree_table, 
elm_obj_table_pack(g_main_wdgs->main_win->objtree_list, 0, 1, 1, 1));
+   eo_do(g_main_wdgs->main_win->propsview_table, 
elm_obj_table_pack(g_main_wdgs->main_win->description_list, 0, 2, 1, 1));
+   eo_do(g_main_wdgs->main_win->propsview_table, 
elm_obj_table_pack(g_main_wdgs->main_win->properties_list, 0, 2, 1, 1));
+   eo_do(g_main_wdgs->main_win->propsview_table, 
elm_obj_table_pack(g_main_wdgs->main_win->callbacksview_box, 0, 2, 1, 1));
+   eo_do(g_main_wdgs->main_win->propsview_table, 
elm_obj_table_pack(g_main_wdgs->main_win->itemview_box, 0, 2, 1, 1));
+   eo_do(g_main_wdgs->main_win->propsview_table, 
elm_obj_table_pack(g_main_wdgs->main_win->contentview_box, 0, 2, 1, 1));
+   eo_do(g_main_wdgs->main_win->left_panel_box, 
elm_obj_box_pack_end(g_main_wdgs->main_win->fctr_scroll));
 }
 
 void

-- 


Reply via email to