rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=a336d01574240cc12f4e6999640127bb8ce6cd78
commit a336d01574240cc12f4e6999640127bb8ce6cd78 Author: Mykyta Biliavskyi <[email protected]> Date: Fri May 27 14:19:31 2016 +0300 Tizen theme: add icons for group and project navigator. --- data/themes/tizen/images/navigator_project.png | Bin 0 -> 1166 bytes data/themes/tizen/widgets/image.edc | 3 +-- data/themes/tizen/widgets/layout.edc | 31 +++++++++++++++++++------ src/bin/ui/project_navigator.c | 7 ++++++ src/bin/ui/workspace/group_navigator.c | 6 +++++ 5 files changed, 38 insertions(+), 9 deletions(-) diff --git a/data/themes/tizen/images/navigator_project.png b/data/themes/tizen/images/navigator_project.png new file mode 100644 index 0000000..34eaef6 Binary files /dev/null and b/data/themes/tizen/images/navigator_project.png differ diff --git a/data/themes/tizen/widgets/image.edc b/data/themes/tizen/widgets/image.edc index bd6b174..e7e47a8 100644 --- a/data/themes/tizen/widgets/image.edc +++ b/data/themes/tizen/widgets/image.edc @@ -60,8 +60,7 @@ IM("border", "2px", "border_2.png", -1 -1, 2 2 2 2, IM("animator", "arrow-left", "animator_arrow_left.png", 13 19, 0 0 0 0, SCALE, SOLID) IM("animator", "arrow-right", "animator_arrow_right.png", 13 19, 0 0 0 0, SCALE, SOLID) -//IM("icon", "scale_smaller", "scale_smaller.png", 15 12, 0 0 0 0, SCALE, SOLID) -//IM("icon", "scale_larger", "scale_larger.png", 26 12, 0 0 0 0, SCALE, SOLID) +IM("navigator", "project", "navigator_project.png", 16 16, 0 0 0 0, SCALE, SOLID) group { name: "elm/image/icon/scale_smaller"; parts { diff --git a/data/themes/tizen/widgets/layout.edc b/data/themes/tizen/widgets/layout.edc index 3928c6d..c839419 100644 --- a/data/themes/tizen/widgets/layout.edc +++ b/data/themes/tizen/widgets/layout.edc @@ -264,11 +264,12 @@ group { name: "elm/layout/navigator/default"; } rel1 { offset: 20 0; - to: "area.top"; + to_x: "elm.swallow.icon"; + to_y: "area.top"; } rel2 { relative: 0.0 1.0; - offset: -4 -1; + offset: -6 -1; to_x: "elm.swallow.btn3"; to_y: "area.top"; } @@ -277,16 +278,28 @@ group { name: "elm/layout/navigator/default"; inherit: "default" 0.00; color_class: "main_disabled"; color: 255 255 255 255; + rel1.to_x: "area.top"; + rel2.offset: -4 -1; } } part { name: "elm.swallow.icon"; type: SWALLOW; description { state: "default" 0.0; - min: 0 16; - max: -1 16; + align: 0.0 0.5; + min: 16 16; + max: 16 16; + rel1 { + offset: 10 0; + to: "area.top"; + } + rel2.to: "area.top"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.00; + visible: 0; } } - part { name: "elm.swallow.content"; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; rel1 { @@ -304,8 +317,10 @@ group { name: "elm/layout/navigator/default"; max: -1 1; color_class: "border"; rel1.to_y: "elm.swallow.content"; - rel2.to_y: "elm.swallow.content"; - rel2.offset: -1 -2; + rel2 { + offset: -1 -2; + to_y: "elm.swallow.content"; + } } } part { name: "elm.swallow.btn0"; @@ -377,12 +392,14 @@ group { name: "elm/layout/navigator/default"; source: "elm"; action: STATE_SET "default" 0.00; target: "elm.text"; + target: "elm.swallow.icon"; } program { name: "disabled"; signal: "elm,state,disabled"; source: "elm"; action: STATE_SET "disabled" 0.00; target: "elm.text"; + target: "elm.swallow.icon"; } } } diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c index 2d35925..4e9435f 100644 --- a/src/bin/ui/project_navigator.c +++ b/src/bin/ui/project_navigator.c @@ -650,6 +650,13 @@ project_navigator_add(void) project_navigator.layout = elm_layout_add(ap.win); elm_layout_theme_set(project_navigator.layout, "layout", "navigator", "default"); + +#ifdef HAVE_TIZEN + Evas_Object *icon; + IMAGE_ADD_NEW(project_navigator.layout, icon, "navigator", "project"); + elm_object_part_content_set(project_navigator.layout, "elm.swallow.icon", icon); +#endif + evas_object_show(project_navigator.layout); project_navigator.btn_add = elm_button_add(project_navigator.layout); diff --git a/src/bin/ui/workspace/group_navigator.c b/src/bin/ui/workspace/group_navigator.c index cdd29f9..5fc2a48 100644 --- a/src/bin/ui/workspace/group_navigator.c +++ b/src/bin/ui/workspace/group_navigator.c @@ -1890,6 +1890,12 @@ group_navigator_add(Evas_Object *parent, Group *group) elm_layout_theme_set(pl->layout, "layout", "navigator", "default"); evas_object_show(pl->layout); +#ifdef HAVE_TIZEN + Evas_Object *icon; + ICON_STANDARD_ADD(pl->layout, icon, true, "file") + elm_object_part_content_set(pl->layout, "elm.swallow.icon", icon); +#endif + evas_object_data_set(pl->layout, GROUP_NAVIGATOR_DATA, pl); pl->group = group; --
