hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=967644fb2ce5b6c1b07fe73a990362f1d6ae62ef
commit 967644fb2ce5b6c1b07fe73a990362f1d6ae62ef Author: ChunEon Park <[email protected]> Date: Sun Jan 26 04:14:42 2014 +0900 improve panes left/right button gui. --- data/themes/default/images.edc | 36 +++++++++++++++++++ data/themes/default/images/Makefile.am | 5 ++- data/themes/default/images/panes_left_arrow.png | Bin 0 -> 670 bytes data/themes/default/images/panes_recover_arrow.png | Bin 0 -> 484 bytes data/themes/default/images/panes_right_arrow.png | Bin 0 -> 668 bytes data/themes/default/theme_ext.edc | 12 +++++++ src/bin/panes.c | 39 ++++++++++++++++----- 7 files changed, 83 insertions(+), 9 deletions(-) diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc index ff0782d..708894e 100644 --- a/data/themes/default/images.edc +++ b/data/themes/default/images.edc @@ -1,6 +1,9 @@ images { image: "plus.png" COMP; image: "minus.png" COMP; + image: "panes_left_arrow.png" COMP; + image: "panes_right_arrow.png" COMP; + image: "panes_recover_arrow.png" COMP; } group { name: "plus_img"; @@ -24,3 +27,36 @@ group { name: "minus_img"; } } } + +group { name: "panes_left_arrow"; + parts { + part { name: "img"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "panes_left_arrow.png"; + } + } + } +} + +group { name: "panes_right_arrow"; + parts { + part { name: "img"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "panes_right_arrow.png"; + } + } + } +} + +group { name: "panes_recover_arrow"; + parts { + part { name: "img"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "panes_recover_arrow.png"; + } + } + } +} diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am index 6f0dccc..9c426b9 100644 --- a/data/themes/default/images/Makefile.am +++ b/data/themes/default/images/Makefile.am @@ -55,4 +55,7 @@ EXTRA_DIST = \ sym_up_light_normal.png \ vgrad_med_lighter.png \ warning.png \ - white_bar_vert_glow.png + white_bar_vert_glow.png \ + panes_left_arrow.png \ + panes_right_arrow.png \ + panes_recover_arrow.png diff --git a/data/themes/default/images/panes_left_arrow.png b/data/themes/default/images/panes_left_arrow.png new file mode 100644 index 0000000..1d20445 Binary files /dev/null and b/data/themes/default/images/panes_left_arrow.png differ diff --git a/data/themes/default/images/panes_recover_arrow.png b/data/themes/default/images/panes_recover_arrow.png new file mode 100644 index 0000000..32744b4 Binary files /dev/null and b/data/themes/default/images/panes_recover_arrow.png differ diff --git a/data/themes/default/images/panes_right_arrow.png b/data/themes/default/images/panes_right_arrow.png new file mode 100644 index 0000000..d4c7532 Binary files /dev/null and b/data/themes/default/images/panes_right_arrow.png differ diff --git a/data/themes/default/theme_ext.edc b/data/themes/default/theme_ext.edc index 21d21d0..7db34a8 100644 --- a/data/themes/default/theme_ext.edc +++ b/data/themes/default/theme_ext.edc @@ -2130,6 +2130,18 @@ group { name: "elm/panes/vertical/enventor"; color: 0 0 0 0; } } + part { name: "elm.swallow.zoom"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + min: 20 20; + fixed: 1 1; + align: 0.5 0; + rel2.relative: 1 0; + rel1.to: "bar"; + rel2.to: "bar"; + } + } part { name: "elm.swallow.left_arrow"; type: SWALLOW; scale: 1; diff --git a/src/bin/panes.c b/src/bin/panes.c index cad2545..45f767f 100644 --- a/src/bin/panes.c +++ b/src/bin/panes.c @@ -76,7 +76,8 @@ left_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) if (pd->state == PANES_FULL_VIEW_LEFT) { panes_full_view_cancel(pd); - elm_object_text_set(obj, "<"); + Evas_Object *left_arrow_img = elm_object_content_get(obj); + elm_image_file_set(left_arrow_img, EDJE_PATH, "panes_left_arrow"); return; } @@ -93,8 +94,11 @@ left_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) elm_transit_go(transit); pd->state = PANES_FULL_VIEW_LEFT; - elm_object_text_set(pd->right_arrow, ">"); - elm_object_text_set(obj, "|"); + Evas_Object *right_arrow_img = elm_object_content_get(pd->right_arrow); + elm_image_file_set(right_arrow_img, EDJE_PATH, "panes_right_arrow"); + + Evas_Object *left_arrow_img = elm_object_content_get(obj); + elm_image_file_set(left_arrow_img, EDJE_PATH, "panes_recover_arrow"); } static void @@ -108,7 +112,8 @@ right_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) if (pd->state == PANES_FULL_VIEW_RIGHT) { panes_full_view_cancel(pd); - elm_object_text_set(obj, ">"); + Evas_Object *right_arrow_img = elm_object_content_get(obj); + elm_image_file_set(right_arrow_img, EDJE_PATH, "panes_right_arrow"); return; } @@ -125,8 +130,11 @@ right_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) elm_transit_go(transit); pd->state = PANES_FULL_VIEW_RIGHT; - elm_object_text_set(pd->left_arrow, "<"); - elm_object_text_set(obj, "|"); + Evas_Object *left_arrow_img = elm_object_content_get(pd->left_arrow); + elm_image_file_set(left_arrow_img, EDJE_PATH, "panes_left_arrow"); + + Evas_Object *right_arrow_img = elm_object_content_get(obj); + elm_image_file_set(right_arrow_img, EDJE_PATH, "panes_recover_arrow"); } void @@ -154,6 +162,9 @@ panes_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object * panes_create(Evas_Object *parent) { + Evas_Object *img; + char buf[PATH_MAX]; + panes_data *pd = malloc(sizeof(panes_data)); //Panes @@ -170,20 +181,32 @@ panes_create(Evas_Object *parent) //Left Button Evas_Object *left_arrow = elm_button_add(panes); - elm_object_text_set(left_arrow, "<"); 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); + //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_text_set(right_arrow, ">"); 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); + //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; --
