yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=004f80e2ae1ec1d44a78d63ab9c91def3b0dcba9
commit 004f80e2ae1ec1d44a78d63ab9c91def3b0dcba9
Author: Yakov Goldberg <yako...@samsung.com>
Date: Tue Jul 28 14:23:37 2015 +0300
Fix resizing of main window (T2559)
Now thhis is possible to resize Main Win to smaller size :)
---
src/bin/gui/egui_layout.json | 2 +-
src/bin/gui/egui_logic.c | 15 ---------------
src/bin/gui/prop_layout.c | 7 +++++++
3 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/bin/gui/egui_layout.json b/src/bin/gui/egui_layout.json
index ad12d4b..318783b 100644
--- a/src/bin/gui/egui_layout.json
+++ b/src/bin/gui/egui_layout.json
@@ -3678,7 +3678,7 @@
"Evas.Object.size_hint_weight":[1, 1],
"Evas.Object.size_hint_align":[-1, -1]
},
- "Contains":["itemview_list", "itemview_buttons_box"]
+ "Contains":["itemview_list"]
},
"itemview_list":
{
diff --git a/src/bin/gui/egui_logic.c b/src/bin/gui/egui_logic.c
index 192069a..d46482c 100644
--- a/src/bin/gui/egui_logic.c
+++ b/src/bin/gui/egui_logic.c
@@ -1003,21 +1003,6 @@ egui_start(const char *filename)
/* hor box and toolbar are in the same main_box and he the same parent
smart obj.
* So stack hor_box under toolbar. */
eo_do(g_main_wdgs->main_win->hor_box,
efl_gfx_stack_below(g_main_wdgs->main_win->toolbar));
- //Eo *mmenu;
- //eo_do(g_main_wdgs->main_win->main_win, elm_obj_win_main_menu_get(&mmenu));
- //eo_do(mmenu, elm_obj_menu_item_add(NULL, NULL, "OPEN", NULL, NULL, NULL));
-
- Evas_Object *objtree_rect =
evas_object_rectangle_add(evas_object_evas_get(g_main_wdgs->main_win->objtree_table));
- evas_object_size_hint_min_set(objtree_rect, 300, 100);
- evas_object_size_hint_weight_set(objtree_rect, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(objtree_rect, EVAS_HINT_FILL,
EVAS_HINT_FILL);
- elm_table_pack(g_main_wdgs->main_win->objtree_table, objtree_rect, 0, 1, 1,
1);
-
- Evas_Object *propsview_rect =
evas_object_rectangle_add(evas_object_evas_get(g_main_wdgs->main_win->propsview_table));
- evas_object_size_hint_min_set(propsview_rect, 300, 100);
- evas_object_size_hint_weight_set(propsview_rect, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(propsview_rect, EVAS_HINT_FILL,
EVAS_HINT_FILL);
- elm_table_pack(g_main_wdgs->main_win->propsview_table, propsview_rect, 0,
2, 1, 1);
settings_init();
key_bindings_init();
diff --git a/src/bin/gui/prop_layout.c b/src/bin/gui/prop_layout.c
index 5bb3e23..06ce705 100644
--- a/src/bin/gui/prop_layout.c
+++ b/src/bin/gui/prop_layout.c
@@ -108,6 +108,10 @@ _proplayout_build_post_cb(const Gui_Widget *wdg,
It_Data_Type new_type)
eo_do(g->main_win->callbacksview_box, efl_gfx_visible_set(EINA_FALSE));
eo_do(g->main_win->description_list, efl_gfx_visible_set(EINA_FALSE));
+
+ eo_do(g->main_win->itemview_box,
elm_obj_box_unpack(g->main_win->itemview_buttons_box));
+ eo_do(g->main_win->itemview_buttons_box, efl_gfx_visible_set(EINA_FALSE));
+
switch (new_type)
{
case DESCRIPTION_TYPE:
@@ -132,6 +136,9 @@ _proplayout_build_post_cb(const Gui_Widget *wdg,
It_Data_Type new_type)
}
case ITEM_TYPE:
{
+ eo_do(g->main_win->itemview_box,
elm_obj_box_pack_end(g->main_win->itemview_buttons_box));
+ eo_do(g->main_win->itemview_buttons_box,
efl_gfx_visible_set(EINA_TRUE));
+
eo_do(g->main_win->contentview_box,
efl_gfx_visible_set(EINA_FALSE));
eo_do(g->main_win->itemview_box, efl_gfx_visible_set(EINA_TRUE));
--
