nikawhite pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=cf014fc14238b3792be4a42d6c87ba4ba6ce484f
commit cf014fc14238b3792be4a42d6c87ba4ba6ce484f Author: Mykyta Biliavskyi <[email protected]> Date: Wed Jul 27 18:34:25 2016 +0300 Tizen theme behaviour: update managers internal markup. Fix markup of manager internal layout. --- data/themes/tizen/color_classes.edc | 8 +- data/themes/tizen/widgets/button.edc | 14 ++- data/themes/tizen/widgets/entry.edc | 69 +++++++++++++ data/themes/tizen/widgets/inwin.edc | 3 +- data/themes/tizen/widgets/layouts/manager.edc | 143 ++++++++++++++++---------- src/bin/ui/colorclass_manager.c | 7 +- src/bin/ui/image_manager.c | 8 +- src/bin/ui/sound_manager.c | 4 + src/bin/ui/style_manager.c | 7 +- 9 files changed, 196 insertions(+), 67 deletions(-) diff --git a/data/themes/tizen/color_classes.edc b/data/themes/tizen/color_classes.edc index 7f4fb2c..38fff8e 100644 --- a/data/themes/tizen/color_classes.edc +++ b/data/themes/tizen/color_classes.edc @@ -216,7 +216,9 @@ color_classes { color2: 0 0 0 0; color3: 0 0 0 0; } - - - + color_class { name: "manager_content_border"; + color: 204 204 204 255; + color2: 0 0 0 0; + color3: 0 0 0 0; + } } diff --git a/data/themes/tizen/widgets/button.edc b/data/themes/tizen/widgets/button.edc index 40ae079..55efd9b 100644 --- a/data/themes/tizen/widgets/button.edc +++ b/data/themes/tizen/widgets/button.edc @@ -1606,12 +1606,15 @@ group { name: "elm/button/base/minus_managers"; image: "POP UP/library_btn_minus_nor.png" COMP; image: "POP UP/library_btn_minus_sel.png" COMP; image: "POP UP/library_btn_minus_mv.png" COMP; + image: "POP UP/library_btn_minus_dim.png" COMP; } parts { part { name: "icon"; type: IMAGE; description { state: "default" 0.0; + min: 24 24; max: 24 24; + fixed: 1 1; image.normal: "POP UP/library_btn_minus_nor.png"; } description { state: "clicked" 0.0; @@ -1620,11 +1623,11 @@ group { name: "elm/button/base/minus_managers"; } description { state: "hilighted" 0.0; inherit: "default" 0.00; + image.normal: "POP UP/library_btn_minus_mv.png"; } description { state: "disabled" 0.0; inherit: "clicked" 0.00; - color_class: "bg_scroller_disabled"; - image.normal: "POP UP/library_btn_minus_mv.png"; + image.normal: "POP UP/library_btn_minus_dim.png"; } } part { name: "event"; @@ -1711,12 +1714,15 @@ group { name: "elm/button/base/plus_managers"; image: "POP UP/library_btn_plus_nor.png" COMP; image: "POP UP/library_btn_plus_sel.png" COMP; image: "POP UP/library_btn_plus_mv.png" COMP; + image: "POP UP/library_btn_plus_dim.png" COMP; } parts { part { name: "icon"; type: IMAGE; description { state: "default" 0.0; + min: 24 24; max: 24 24; + fixed: 1 1; image.normal: "POP UP/library_btn_plus_nor.png"; } description { state: "clicked" 0.0; @@ -1725,11 +1731,11 @@ group { name: "elm/button/base/plus_managers"; } description { state: "hilighted" 0.0; inherit: "default" 0.00; + image.normal: "POP UP/library_btn_plus_mv.png"; } description { state: "disabled" 0.0; inherit: "clicked" 0.00; - color_class: "bg_scroller_disabled"; - image.normal: "POP UP/library_btn_plus_mv.png"; + image.normal: "POP UP/library_btn_plus_dim.png"; } } part { name: "event"; diff --git a/data/themes/tizen/widgets/entry.edc b/data/themes/tizen/widgets/entry.edc index c46be84..4a3db6a 100644 --- a/data/themes/tizen/widgets/entry.edc +++ b/data/themes/tizen/widgets/entry.edc @@ -305,6 +305,8 @@ group { name: "elm/scroller/entry_single/default"; visible: 0; align: 1.0 0.5; max: 0 -1; + min: 16 16; + max: 16 16; rel1.to: "bg"; rel2 { offset: -2 -1; @@ -426,6 +428,73 @@ group { name: "elm/scroller/entry_single/default"; } } +group { name: "elm/scroller/entry_single/search"; + inherit: "elm/scroller/entry_single/default"; + images { + image: "POP UP/library_search_info_mv.png" COMP; + image: "POP UP/library_search_info_sel.png" COMP; + image: "POP UP/library_search_info_nor.png" COMP; + } + parts { + part { name: "icon_search"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "POP UP/library_search_info_nor.png"; + rel1.to: "elm.swallow.end"; + rel2.to: "elm.swallow.end"; + fill.smooth: 0; + } + description { state: "hovered" 0.0; + inherit: "default" 0.0; + image.normal: "POP UP/library_search_info_mv.png"; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + image.normal: "POP UP/library_search_info_sel.png"; + } + } + } + programs { + program { name: "hovered"; + signal: "mouse,in"; + source: "events"; + filter: "dummy" "default"; + action: STATE_SET "hovered" 0.00; + target: "bg"; + target: "icon_search"; + target: "border"; + } + program { name: "unhovered"; + signal: "mouse,out"; + source: "events"; + filter: "dummy" "default"; + action: STATE_SET "default" 0.00; + target: "bg"; + target: "border"; + target: "icon_search"; + } + program { name: "focused"; + signal: "elm,action,focus"; + source: "elm"; + action: STATE_SET "focused" 0.00; + target: "bg"; + target: "dummy"; + target: "border"; + target: "icon_search"; + } + program { name: "unfocused"; + signal: "elm,action,unfocus"; + source: "elm"; + action: STATE_SET "default" 0.00; + target: "bg"; + target: "dummy"; + target: "border"; + target: "icon_search"; + } + } +} + + group { name: "elm/scroller/entry_single/fileselector/default"; inherit: "elm/scroller/entry_single/default"; parts { diff --git a/data/themes/tizen/widgets/inwin.edc b/data/themes/tizen/widgets/inwin.edc index 0c3f10d..c468001 100644 --- a/data/themes/tizen/widgets/inwin.edc +++ b/data/themes/tizen/widgets/inwin.edc @@ -46,6 +46,7 @@ group { name: "elm/win/inwin/modal_window"; part { name: "bg"; type: RECT; description { state: "default" 0.0; + max: 960 625; rel1.relative: 0.1 0.1; rel2.relative: 0.9 0.9; } @@ -170,7 +171,7 @@ group { name: "elm/win/inwin/modal_window"; } rel2 { relative: 1.0 0.0; - offset: -21 -21; + offset: -21 -20; to_x: "base"; to_y: "separator.buttons"; } diff --git a/data/themes/tizen/widgets/layouts/manager.edc b/data/themes/tizen/widgets/layouts/manager.edc index efbbff2..1db0d0b 100644 --- a/data/themes/tizen/widgets/layouts/manager.edc +++ b/data/themes/tizen/widgets/layouts/manager.edc @@ -6,44 +6,44 @@ group { name: "elm/layout/manager/internal"; description { state: "default" 0.0; align: 0.0 0.0; fixed: 0 1; - max: -1 19; + max: -1 13; color_class: "genlist_text_tree"; text { - font: FN; + font: "Breeze"; size: 13; max: 1 0; } - rel2.offset: -7 -1; + rel1.to_x: "border"; + rel2.to_x: "border"; } } - part { name: "border_preview"; + part { name: "border"; type: RECT; description { state: "default" 0.0; align: 0.5 0.0; - max: -1 173; - color: 204 204 204 255; + min: 549 480; + max: 549 480; + color_class: "manager_content_border"; rel1 { relative: 0.0 1.0; offset: 0 8; to_y: "elm.text"; } - rel2.offset: -1 -1; } } - part { name: "bg_preview"; + part { name: "bg"; type: RECT; scale: 1; description { state: "default" 0.0; align: 0.0 0.0; fixed: 1 1; - max: -1 173; rel1 { offset: 1 1; - to: "border_preview"; + to: "border"; } rel2 { offset: -2 -2; - to: "border_preview"; + to: "border"; } } } @@ -53,36 +53,73 @@ group { name: "elm/layout/manager/internal"; description { state: "default" 0.0; align: 0.0 0.0; fixed: 1 1; - max: -1 173; + min: 0 171; + max: -1 171; + rel1.to: "bg"; + rel2.to: "bg"; + } + } + part { name: "preview_bottom_line"; + type: RECT; + description { state: "default" 0.0; + align: 0.5 1.0; + fixed: 0 1; + min: 0 2; + max: -1 2; + color_class: "separator"; rel1 { - offset: 1 1; - to: "border_preview"; + to_x: "bg"; + to_y: "elm.swallow.preview"; } rel2 { - offset: -2 -2; - to: "border_preview"; + to_x: "bg"; + to_y: "elm.swallow.preview"; + } + } + } + part { name: "elm.swallow.search"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + min: 466 24; + max: 466 24; + fixed: 1 1; + rel1 { + relative: 0.0 1.0; + offset: 11 10; + to_x: "bg"; + to_y: "preview_bottom_line"; + } + rel2 { + relative: 0.0 1.0; + offset: -10 0; + to: "bg"; } } } part { name: "border_list"; type: RECT; - scale: 1; description { state: "default" 0.0; - fixed: 0 1; - color: 204 204 204 255; + align: 0.5 0.0; + min: 0 249; + max: -1 249; + color_class: "manager_content_border"; rel1 { relative: 0.0 1.0; + offset: 12 5; + to_x: "bg"; to_y: "elm.swallow.search"; } - rel2.offset: -1 -1; + rel2 { + offset: -12 -1; + to: "bg"; + } } } - part { name: "elm.swallow.list"; - type: SWALLOW; - scale: 1; + part { name: "bg_list"; + type: RECT; description { state: "default" 0.0; - align: 1.0 1.0; - fixed: 1 1; rel1 { offset: 1 1; to: "border_list"; @@ -93,60 +130,54 @@ group { name: "elm/layout/manager/internal"; } } } - part { name: "elm.swallow.btn_del"; + part { name: "elm.swallow.list"; type: SWALLOW; scale: 1; description { state: "default" 0.0; align: 1.0 0.0; - min: 24 0; - max: 24 23; - rel1 { - relative: 0.0 1.0; - offset: 0 15; - to_y: "elm.swallow.preview"; - } - rel2 { - offset: -1 -1; - to_y: "elm.swallow.search"; - } + fixed: 1 1; + min: 0 247; + max: -1 247; + rel1.to: "bg_list"; + rel2.to: "bg_list"; } } - part { name: "elm.swallow.btn_add"; + part { name: "elm.swallow.btn_del"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - align: 1.0 0.0; - min: 24 23; - max: 24 23; + align: 0.0 0.5; + fixed: 1 1; + min: 24 24; + max: 24 24; rel1 { - relative: 0.0 1.0; - offset: 0 15; - to_y: "elm.swallow.preview"; + relative: 1.0 0.0; + offset: 5 0; + to_x: "elm.swallow.btn_add"; + to_y: "elm.swallow.search"; } rel2 { - relative: 0.0 1.0; - offset: -6 -1; - to_x: "elm.swallow.btn_del"; + to_x: "elm.swallow.btn_add"; to_y: "elm.swallow.search"; } } } - part { name: "elm.swallow.search"; + part { name: "elm.swallow.btn_add"; type: SWALLOW; scale: 1; description { state: "default" 0.0; - align: 0.0 0.0; - max: -1 30; + align: 0.0 0.5; + fixed: 1 1; + min: 24 24; + max: 24 24; rel1 { - relative: 0.0 1.0; - offset: 0 10; - to_x: "elm.swallow.list"; - to_y: "elm.swallow.preview"; + relative: 1.0 0.0; + offset: 9 0; + to: "elm.swallow.search"; } rel2 { relative: 0.0 1.0; - offset: -10 4; - to_x: "elm.swallow.btn_add"; + to: "elm.swallow.search"; } } } diff --git a/src/bin/ui/colorclass_manager.c b/src/bin/ui/colorclass_manager.c index cc489d6..56e34cf 100644 --- a/src/bin/ui/colorclass_manager.c +++ b/src/bin/ui/colorclass_manager.c @@ -244,14 +244,19 @@ ITEM_SEARCH_FUNC(genlist,ELM_GENLIST_ITEM_SCROLLTO_MIDDLE, "elm.text") static inline Evas_Object * _manager_search_field_create(Evas_Object *parent) { - Evas_Object *entry, *icon; + Evas_Object *entry; assert(parent != NULL); ENTRY_ADD(parent, entry, true); elm_object_part_text_set(entry, "guide", _("Search")); +#if !HAVE_TIZEN + Evas_Object *icon; ICON_STANDARD_ADD(entry, icon, true, "search"); elm_object_part_content_set(entry, "elm.swallow.end", icon); +#else + elm_object_style_set(entry, "search"); +#endif return entry; } static void diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c index 770cd34..a29a4b0 100644 --- a/src/bin/ui/image_manager.c +++ b/src/bin/ui/image_manager.c @@ -413,14 +413,20 @@ _find_next_cb(void *data __UNUSED__, static inline Evas_Object * _image_manager_search_field_create(Evas_Object *parent) { - Evas_Object *entry, *icon; + Evas_Object *entry; assert(parent != NULL); ENTRY_ADD(parent, entry, true); elm_object_part_text_set(entry, "guide", _("Search")); +#if !HAVE_TIZEN + Evas_Object *icon; ICON_STANDARD_ADD(entry, icon, true, "search"); elm_object_part_content_set(entry, "elm.swallow.end", icon); +#else + elm_object_style_set(entry, "search"); +#endif + return entry; } diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c index 6acb849..0ead0b2 100644 --- a/src/bin/ui/sound_manager.c +++ b/src/bin/ui/sound_manager.c @@ -624,8 +624,12 @@ sound_manager_add(void) ENTRY_ADD(mng.layout, search_entry, true); elm_object_part_text_set(search_entry, "guide", _("Search")); +#if !HAVE_TIZEN ICON_STANDARD_ADD(search_entry, ic, true, "search"); elm_object_part_content_set(search_entry, "elm.swallow.end", ic); + #else + elm_object_style_set(search_entry, "search"); +#endif elm_layout_content_set(mng.layout, "elm.swallow.search", search_entry); evas_object_smart_callback_add(search_entry, "changed", _search_changed_cb, NULL); evas_object_smart_callback_add(search_entry, "activated", _find_next_cb, NULL); diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c index 5ff1f23..35e0cb4 100644 --- a/src/bin/ui/style_manager.c +++ b/src/bin/ui/style_manager.c @@ -421,14 +421,19 @@ _item_tags_icon_get(void *data __UNUSED__, static inline Evas_Object * _style_manager_search_field_create(Evas_Object *parent) { - Evas_Object *entry, *icon; + Evas_Object *entry; assert(parent != NULL); ENTRY_ADD(parent, entry, true); elm_object_part_text_set(entry, "guide", _("Search")); + #if !HAVE_TIZEN + Evas_Object *icon; ICON_STANDARD_ADD(entry, icon, true, "search"); elm_object_part_content_set(entry, "elm.swallow.end", icon); +#else + elm_object_style_set(entry, "search"); +#endif return entry; } --
