hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=052876b7d396321373c00183019b8e053f567e04
commit 052876b7d396321373c00183019b8e053f567e04
Author: ChunEon Park <her...@hermet.pe.kr>
Date: Sun Mar 2 14:48:58 2014 +0900
refactoring - removed unnecessary object show calls.
Since the edje sets the visibility of the contents according to it's own
layout description
we don't need to set the content visibility additionally.
---
src/bin/base_gui.c | 1 -
src/bin/ctxpopup.c | 15 ---------------
src/bin/dummy_obj.c | 1 -
src/bin/edc_editor.c | 8 --------
src/bin/edj_mgr.c | 1 -
src/bin/edj_viewer.c | 3 ---
src/bin/hotkeys.c | 1 -
src/bin/menu.c | 15 ---------------
src/bin/panes.c | 20 +++-----------------
src/bin/search.c | 6 ------
src/bin/statusbar.c | 1 -
11 files changed, 3 insertions(+), 69 deletions(-)
diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index cbb2d03..563182c 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -133,7 +133,6 @@ base_gui_init()
Evas_Object *icon = evas_object_image_add(evas_object_evas_get(win));
snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get());
evas_object_image_file_set(icon, buf, NULL);
- evas_object_show(icon);
elm_win_icon_object_set(win, icon);
//Base Layout
diff --git a/src/bin/ctxpopup.c b/src/bin/ctxpopup.c
index 156671c..8f4ac15 100644
--- a/src/bin/ctxpopup.c
+++ b/src/bin/ctxpopup.c
@@ -114,8 +114,6 @@ ctxpopup_candidate_list_create(Evas_Object *parent,
attr_value *attr,
//Layout
Evas_Object *layout = elm_layout_add(ctxpopup);
elm_layout_file_set(layout, EDJE_PATH, "slider_layout");
- evas_object_show(layout);
-
elm_object_content_set(ctxpopup, layout);
//Slider
@@ -127,8 +125,6 @@ ctxpopup_candidate_list_create(Evas_Object *parent,
attr_value *attr,
elm_slider_min_max_set(slider, attr->min, attr->max);
elm_slider_value_set(slider, slider_val);
evas_object_data_set(slider, "attr", attr);
- evas_object_show(slider);
-
elm_object_part_content_set(layout, "elm.swallow.slider", slider);
Evas_Object *btn;
@@ -136,30 +132,22 @@ ctxpopup_candidate_list_create(Evas_Object *parent,
attr_value *attr,
//Minus Button
btn = elm_button_add(layout);
- evas_object_show(btn);
evas_object_smart_callback_add(btn, "clicked", btn_minus_cb, slider);
-
elm_object_part_content_set(layout, "elm.swallow.minus", btn);
//Minus Image
img = elm_image_add(btn);
elm_image_file_set(img, EDJE_PATH, "minus");
- evas_object_show(img);
-
elm_object_content_set(btn, img);
//Plus Button
btn = elm_button_add(layout);
- evas_object_show(btn);
evas_object_smart_callback_add(btn, "clicked", btn_plus_cb, slider);
-
elm_object_part_content_set(layout, "elm.swallow.plus", btn);
//Plus Image
img = elm_image_add(btn);
elm_image_file_set(img, EDJE_PATH, "plus");
- evas_object_show(img);
-
elm_object_content_set(btn, img);
evas_object_smart_callback_add(ctxpopup, "dismissed",
@@ -211,8 +199,6 @@ ctxpopup_img_preview_create(Evas_Object *parent, const char
*imgpath,
//Layout
Evas_Object *layout = elm_layout_add(ctxpopup);
elm_layout_file_set(layout, EDJE_PATH, "preview_layout");
- evas_object_show(layout);
-
elm_object_content_set(ctxpopup, layout);
Evas *e = evas_object_evas_get(ctxpopup);
@@ -221,7 +207,6 @@ ctxpopup_img_preview_create(Evas_Object *parent, const char
*imgpath,
Evas_Coord w, h;
evas_object_image_size_get(img, &w, &h);
evas_object_size_hint_aspect_set(img, EVAS_ASPECT_CONTROL_BOTH, w, h);
- evas_object_show(img);
elm_object_part_content_set(layout, "elm.swallow.img", img);
evas_object_smart_callback_add(ctxpopup, "dismissed", ctxpopup_dismiss_cb,
diff --git a/src/bin/dummy_obj.c b/src/bin/dummy_obj.c
index f492d73..b5a4259 100644
--- a/src/bin/dummy_obj.c
+++ b/src/bin/dummy_obj.c
@@ -73,7 +73,6 @@ dummy_objs_update(dummy_obj *dummy)
//New part. Add fake object.
Evas_Object *obj = edje_object_add(dummy->layout);
edje_object_file_set(obj, EDJE_PATH, "swallow");
- evas_object_show(obj);
edje_object_part_swallow(dummy->layout, part_name, obj);
po->obj = obj;
diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c
index f3cb45d..d61ee60 100644
--- a/src/bin/edc_editor.c
+++ b/src/bin/edc_editor.c
@@ -669,15 +669,12 @@ edit_init(Evas_Object *parent)
evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_show(scroller);
//Layout
Evas_Object *layout = elm_layout_add(scroller);
elm_layout_file_set(layout, EDJE_PATH, "edit_layout");
evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_show(layout);
-
elm_object_content_set(scroller, layout);
//Line Number Entry
@@ -687,8 +684,6 @@ edit_init(Evas_Object *parent)
elm_entry_line_wrap_set(en_line, EINA_FALSE);
evas_object_size_hint_weight_set(en_line, 0, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(en_line, 0, EVAS_HINT_FILL);
- evas_object_show(en_line);
-
elm_object_part_content_set(layout, "elm.swallow.linenumber", en_line);
//EDC Editor Entry
@@ -707,10 +702,7 @@ edit_init(Evas_Object *parent)
evas_object_size_hint_align_set(en_edit, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_event_callback_add(en_edit, EVAS_CALLBACK_MOUSE_DOWN,
edit_mouse_down_cb, ed);
- evas_object_show(en_edit);
-
elm_object_focus_set(en_edit, EINA_TRUE);
-
elm_object_part_content_set(layout, "elm.swallow.edit", en_edit);
search_entry_register(en_edit);
diff --git a/src/bin/edj_mgr.c b/src/bin/edj_mgr.c
index b7ee3f2..c1d663c 100644
--- a/src/bin/edj_mgr.c
+++ b/src/bin/edj_mgr.c
@@ -66,7 +66,6 @@ edj_mgr_init(Evas_Object *parent)
Evas_Object *layout = elm_layout_add(parent);
elm_layout_file_set(layout, EDJE_PATH, "viewer_layout");
- evas_object_show(layout);
em->layout = layout;
}
diff --git a/src/bin/edj_viewer.c b/src/bin/edj_viewer.c
index 543bc8c..fbf5412 100644
--- a/src/bin/edj_viewer.c
+++ b/src/bin/edj_viewer.c
@@ -125,7 +125,6 @@ view_scroller_create(Evas_Object *parent)
evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_show(scroller);
return scroller;
}
@@ -201,8 +200,6 @@ view_obj_create(view_data *vd, const char *file_path, const
char *group)
edje_object_signal_callback_add(layout,
"edje,change,file", "edje",
edje_change_file_cb, vd);
- evas_object_show(layout);
-
view_obj_min_update(layout);
return layout;
diff --git a/src/bin/hotkeys.c b/src/bin/hotkeys.c
index a027c77..30ef22e 100644
--- a/src/bin/hotkeys.c
+++ b/src/bin/hotkeys.c
@@ -78,7 +78,6 @@ hotkeys_create(Evas_Object *parent, edit_data *ed)
{
Evas_Object *box = elm_box_add(parent);
elm_box_horizontal_set(box, EINA_TRUE);
- evas_object_show(box);
Evas_Object *btn;
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 759f6e4..aae29a5 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -167,23 +167,18 @@ warning_layout_create(menu_data *md, Evas_Smart_Cb yes_cb,
evas_object_smart_callback_add(btn, "clicked", save_cb, md);
evas_object_show(btn);
elm_object_focus_set(btn, EINA_TRUE);
-
elm_object_part_content_set(layout, "elm.swallow.save", btn);
//No Button
btn = elm_button_add(layout);
elm_object_text_set(btn, "No");
evas_object_smart_callback_add(btn, "clicked", warning_no_btn_cb, md);
- evas_object_show(btn);
-
elm_object_part_content_set(layout, "elm.swallow.no", btn);
//Yes Button
btn = elm_button_add(layout);
elm_object_text_set(btn, "Yes");
evas_object_smart_callback_add(btn, "clicked", yes_cb, md);
- evas_object_show(btn);
-
elm_object_part_content_set(layout, "elm.swallow.yes", btn);
if (md->menu_layout)
@@ -373,7 +368,6 @@ setting_open(menu_data *md)
//Preference
Evas_Object *scroller = elm_scroller_add(layout);
elm_object_part_content_set(layout, "elm.swallow.preference", scroller);
- evas_object_show(scroller);
Evas_Object *box = elm_box_add(scroller);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -484,24 +478,18 @@ setting_open(menu_data *md)
btn = elm_button_add(layout);
elm_object_text_set(btn, "Apply");
evas_object_smart_callback_add(btn, "clicked", setting_apply_btn_cb, md);
- evas_object_show(btn);
-
elm_object_part_content_set(layout, "elm.swallow.apply_btn", btn);
//Reset Button
btn = elm_button_add(layout);
elm_object_text_set(btn, "Reset");
evas_object_smart_callback_add(btn, "clicked", setting_reset_btn_cb, md);
- evas_object_show(btn);
-
elm_object_part_content_set(layout, "elm.swallow.reset_btn", btn);
//Cancel Button
btn = elm_button_add(layout);
elm_object_text_set(btn, "Cancel");
evas_object_smart_callback_add(btn, "clicked", setting_cancel_btn_cb, md);
- evas_object_show(btn);
-
elm_object_part_content_set(layout, "elm.swallow.cancel_btn", btn);
if (md->menu_layout)
@@ -541,11 +529,8 @@ about_open(menu_data *md)
elm_entry_line_wrap_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
-
elm_object_focus_set(entry, EINA_TRUE);
-
elm_object_part_content_set(layout, "elm.swallow.entry", entry);
-
elm_entry_entry_append(entry, "<color=#ffffff>");
//Read README
diff --git a/src/bin/panes.c b/src/bin/panes.c
index 10336e6..7da74fa 100644
--- a/src/bin/panes.c
+++ b/src/bin/panes.c
@@ -197,14 +197,12 @@ panes_init(Evas_Object *parent)
press_cb, NULL);
evas_object_smart_callback_add(panes, "unpress",
unpress_cb, NULL);
- evas_object_show(panes);
-
//Hotkey Button
Evas_Object *hotkeys_btn = elm_button_add(panes);
elm_object_focus_allow_set(hotkeys_btn, EINA_FALSE);
evas_object_smart_callback_add(hotkeys_btn, "clicked", hotkeys_clicked_cb,
NULL);
- evas_object_show(hotkeys_btn);
+ elm_object_part_content_set(panes, "elm.swallow.hotkeys", hotkeys_btn);
//Hotkey Image
img = elm_image_add(hotkeys_btn);
@@ -212,42 +210,30 @@ panes_init(Evas_Object *parent)
elm_image_file_set(img, EDJE_PATH, "hotkeys_close");
else
elm_image_file_set(img, EDJE_PATH, "hotkeys_open");
- evas_object_show(img);
-
elm_object_content_set(hotkeys_btn, img);
- elm_object_part_content_set(panes, "elm.swallow.hotkeys", hotkeys_btn);
-
//Left Button
Evas_Object *left_arrow = elm_button_add(panes);
elm_object_focus_allow_set(left_arrow, EINA_FALSE);
evas_object_smart_callback_add(left_arrow, "clicked", left_clicked_cb, pd);
- evas_object_show(left_arrow);
+ elm_object_part_content_set(panes, "elm.swallow.left_arrow", left_arrow);
//Left Arrow Image
img = elm_image_add(left_arrow);
elm_image_file_set(img, EDJE_PATH, "panes_left_arrow");
- evas_object_show(img);
-
elm_object_content_set(left_arrow, img);
- elm_object_part_content_set(panes, "elm.swallow.left_arrow", left_arrow);
-
//Right Button
Evas_Object *right_arrow = elm_button_add(panes);
elm_object_focus_allow_set(right_arrow, EINA_FALSE);
evas_object_smart_callback_add(right_arrow, "clicked", right_clicked_cb,
pd);
- evas_object_show(right_arrow);
+ elm_object_part_content_set(panes, "elm.swallow.right_arrow", right_arrow);
//Right Arrow Image
img = elm_image_add(right_arrow);
elm_image_file_set(img, EDJE_PATH, "panes_right_arrow");
- evas_object_show(img);
-
elm_object_content_set(right_arrow, img);
- elm_object_part_content_set(panes, "elm.swallow.right_arrow", right_arrow);
-
pd->panes = panes;
pd->left_arrow = left_arrow;
pd->right_arrow = right_arrow;
diff --git a/src/bin/search.c b/src/bin/search.c
index 000e02a..f62cde5 100644
--- a/src/bin/search.c
+++ b/src/bin/search.c
@@ -132,7 +132,6 @@ search_open()
elm_entry_scrollable_set(entry_find, EINA_TRUE);
evas_object_size_hint_weight_set(entry_find, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(entry_find, EVAS_HINT_FILL, 0);
- evas_object_show(entry_find);
elm_object_focus_set(entry_find, EINA_TRUE);
elm_object_part_content_set(layout, "elm.swallow.find_entry", entry_find);
@@ -142,21 +141,18 @@ search_open()
elm_entry_scrollable_set(entry_replace, EINA_TRUE);
evas_object_size_hint_weight_set(entry_replace, EVAS_HINT_EXPAND,0);
evas_object_size_hint_align_set(entry_replace, EVAS_HINT_FILL, 0);
- evas_object_show(entry_replace);
elm_object_part_content_set(layout, "elm.swallow.replace_entry",
entry_replace);
//Button (find)
Evas_Object *btn_find = elm_button_add(layout);
elm_object_text_set(btn_find, "Find");
evas_object_smart_callback_add(btn_find, "clicked", find_clicked_cb, sd);
- evas_object_show(btn_find);
elm_object_part_content_set(layout, "elm.swallow.find", btn_find);
//Button (find/replace)
Evas_Object *btn_replace_find = elm_button_add(layout);
elm_object_text_set(btn_replace_find, "Find/Replace");
elm_object_disabled_set(btn_replace_find, EINA_TRUE);
- evas_object_show(btn_replace_find);
elm_object_part_content_set(layout, "elm.swallow.replace/find",
btn_replace_find);
@@ -164,14 +160,12 @@ search_open()
Evas_Object *btn_replace = elm_button_add(layout);
elm_object_text_set(btn_replace, "Replace");
elm_object_disabled_set(btn_replace, EINA_TRUE);
- evas_object_show(btn_replace);
elm_object_part_content_set(layout, "elm.swallow.replace", btn_replace);
//Button (replace all)
Evas_Object *btn_replace_all = elm_button_add(layout);
elm_object_text_set(btn_replace_all, "Replace All");
elm_object_disabled_set(btn_replace_all, EINA_TRUE);
- evas_object_show(btn_replace_all);
elm_object_part_content_set(layout, "elm.swallow.replace_all",
btn_replace_all);
sd->win = win;
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index d83f8ba..57bc02a 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -43,7 +43,6 @@ stats_init(Evas_Object *parent)
Evas_Object *layout = elm_layout_add(parent);
elm_layout_file_set(layout, EDJE_PATH, "statusbar_layout");
- evas_object_show(layout);
sd->layout = layout;
--
