hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=30af154860dc07c29d9e23de734f10f3b82ba909
commit 30af154860dc07c29d9e23de734f10f3b82ba909
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Feb 19 02:52:49 2016 +0900
revise previous patch code.
d929258e573a3d42e9ac611fa0fc22bdc6aa0aed.
scalable.
icon.
etc...
---
data/themes/default/images.edc | 2 ++
data/themes/default/images/Makefile.am | 3 ++-
data/themes/default/images/icon_close.png | Bin 0 -> 426 bytes
data/themes/default/layout_common.edc | 35 +++++++++++++++++-------------
src/bin/menu.c | 35 +++++++++++++-----------------
5 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc
index c0a9eca..1756b86 100644
--- a/data/themes/default/images.edc
+++ b/data/themes/default/images.edc
@@ -1,4 +1,5 @@
images {
+ image: "icon_close.png" COMP;
image: "slider_up.png" COMP;
image: "slider_down.png" COMP;
image: "menu.png" COMP;
@@ -53,5 +54,6 @@ ICON_GROUP("Spacer", "live_spacer.png")
ICON_GROUP("Swallow", "live_swallow.png")
ICON_GROUP("Text", "live_text.png")
ICON_GROUP("Textblock", "live_textblock.png")
+ICON_GROUP("close", "icon_close.png")
#undef ICON_GROUP
diff --git a/data/themes/default/images/Makefile.am
b/data/themes/default/images/Makefile.am
index 37de141..58eab21 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -69,4 +69,5 @@ EXTRA_DIST = \
white_bar_vert_glow.png \
horizontal_separated_bar_small_glow.png \
expand.png \
- invert.png
+ invert.png \
+ icon_close.png
diff --git a/data/themes/default/images/icon_close.png
b/data/themes/default/images/icon_close.png
new file mode 100644
index 0000000..d3a58ff
Binary files /dev/null and b/data/themes/default/images/icon_close.png differ
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index f9f5aea..b8600d2 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -60,16 +60,28 @@ group { name: "about_layout";
rel2.relative: 0 0;
}
}
- part { name: "elm.swallow.back_button";
- type: SWALLOW;
+ swallow { "elm.swallow.back_button";
scale: 1;
- description { state: "default" 0.0;
+ clip_to: "clipper";
+ desc {
fixed: 1 1;
min: 26 26;
max: 26 26;
- rel1.offset: 0 10;
- rel2.offset: -37 -1;
align: 1 0.0;
+ rel1.relative: 0 0;
+ rel2.relative: 0 0;
+ rel1.to: "back_button_padding";
+ rel2.to: "back_button_padding";
+ }
+ }
+ spacer { "back_button_padding";
+ scale: 1;
+ desc {
+ fixed: 1 1;
+ min: 22 0;
+ align: 1 0.0;
+ rel1.relative: 1 0;
+ rel2.relative: 1 0;
}
}
part { name: "event_blocker";
@@ -942,15 +954,13 @@ group { name: "menu_layout";
align: 1 1;
}
}
- part { name: "elm.swallow.back_button";
- type: SWALLOW;
+ swallow { "elm.swallow.back_button";
scale: 1;
- description { state: "default" 0.0;
+ clip_to: "clipper";
+ desc {
fixed: 1 1;
min: 26 26;
max: 26 26;
- rel1.offset: 0 10;
- rel2.offset: -37 -1;
align: 1 0.0;
}
}
@@ -1007,11 +1017,6 @@ group { name: "menu_layout";
program { name: "dismiss_done";
action: SIGNAL_EMIT "elm,state,dismiss,done" "";
}
- program { "bg_clicked";
- signal: "mouse,clicked,1";
- source: "bg";
- action: SIGNAL_EMIT "elm,state,clicked" "";
- }
}
}
diff --git a/src/bin/menu.c b/src/bin/menu.c
index b1cb2c9..3894480 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -138,15 +138,15 @@ newfile_cancel_btn_cb(void *data, Evas_Object *obj
EINA_UNUSED,
}
static void
-about_close_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *envent_info EINA_UNUSED)
+about_back_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
+ void *envent_info EINA_UNUSED)
{
menu_data *md = data;
about_close(md);
}
static void
-menu_close_cb(void *data, Evas_Object *obj EINA_UNUSED,
+menu_back_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *envent_info EINA_UNUSED)
{
menu_data *md = data;
@@ -247,13 +247,16 @@ about_open(menu_data *md)
//Back Button
Evas_Object *back_button = elm_button_add(layout);
+ elm_object_style_set(back_button, elm_app_name_get());
+ elm_object_scale_set(back_button, 1.15);
elm_object_focus_allow_set(back_button, EINA_FALSE);
evas_object_show(back_button);
- evas_object_smart_callback_add(back_button, "clicked", about_close_cb, md);
+ evas_object_smart_callback_add(back_button, "clicked",
+ about_back_btn_clicked_cb, md);
- //back button image can be changed to another one
+ //Back Button Icon
Evas_Object *back_img = elm_image_add(back_button);
- elm_image_file_set(back_img, EDJE_PATH, "undo");
+ elm_image_file_set(back_img, EDJE_PATH, "close");
elm_object_content_set(back_button, back_img);
elm_object_part_content_set(layout, "elm.swallow.back_button", back_button);
@@ -327,15 +330,6 @@ exit_btn_cb(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
menu_exit();
}
-static void
-menu_clicked(void *data, Evas_Object *obj EINA_UNUSED,
- const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
-{
- menu_data *md = data;
- enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
- menu_toggle();
-}
-
static Evas_Object *
btn_create(Evas_Object *parent, const char *label, Evas_Smart_Cb cb, void
*data)
{
@@ -628,8 +622,6 @@ menu_open(menu_data *md)
//Layout
Evas_Object *layout = elm_layout_add(base_win_get());
elm_layout_file_set(layout, EDJE_PATH, "menu_layout");
- elm_object_signal_callback_add(layout, "elm,state,clicked", "",
- menu_clicked, md);
elm_object_signal_callback_add(layout, "elm,state,dismiss,done", "",
menu_dismiss_done, md);
evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
@@ -638,13 +630,16 @@ menu_open(menu_data *md)
//Back Button
Evas_Object *back_button = elm_button_add(layout);
+ elm_object_style_set(back_button, elm_app_name_get());
+ elm_object_scale_set(back_button, 1.15);
elm_object_focus_allow_set(back_button, EINA_FALSE);
evas_object_show(back_button);
- evas_object_smart_callback_add(back_button, "clicked", menu_close_cb, md);
+ evas_object_smart_callback_add(back_button, "clicked",
+ menu_back_btn_clicked_cb, md);
- //back button image can be changed to another one
+ //Back Button Icon
Evas_Object *back_img = elm_image_add(back_button);
- elm_image_file_set(back_img, EDJE_PATH, "undo");
+ elm_image_file_set(back_img, EDJE_PATH, "close");
elm_object_content_set(back_button, back_img);
elm_object_part_content_set(layout, "elm.swallow.back_button", back_button);
--
