rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=8dbb26bba40f283b8641e90975d0e9c2963d60fb
commit 8dbb26bba40f283b8641e90975d0e9c2963d60fb Author: Mykyta Biliavskyi <[email protected]> Date: Tue Jan 24 16:13:44 2017 +0200 Tizen theme: update theme of images set gengrid item. Fix style of the gengrid item, that uses for images set representation. Fixed border and texts colors. --- data/themes/tizen/widgets/gengrid.edc | 195 ++++++++++++---------------------- 1 file changed, 68 insertions(+), 127 deletions(-) diff --git a/data/themes/tizen/widgets/gengrid.edc b/data/themes/tizen/widgets/gengrid.edc index 9aebbee..73744bb 100644 --- a/data/themes/tizen/widgets/gengrid.edc +++ b/data/themes/tizen/widgets/gengrid.edc @@ -372,14 +372,13 @@ group { name: "elm/gengrid/item/image_set/default"; item: "texts" "elm.text elm.text.count"; item: "contents" "elm.swallow.first elm.swallow.second elm.swallow.third elm.swallow.fouth elm.swallow.end"; } - images.image: "Custom/border_1.png" COMP; parts { part { name: "highlight_content"; type: RECT; mouse_events: 0; clip_to: "disclip"; description { state: "default" 0.00; - color_class: "border"; + color_class: "gengrid_item_border"; rel1.to: "icon_border"; rel2.to: "icon_border"; } @@ -392,8 +391,6 @@ group { name: "elm/gengrid/item/image_set/default"; type: RECT; description { state: "default" 0.00; color_class: "gengrid_text_default"; - rel1.to: "elm.text"; - rel2.to: "elm.text"; } description { state: "selected" 0.00; inherit: "default" 0.00; @@ -418,14 +415,11 @@ group { name: "elm/gengrid/item/image_set/default"; repeat_events: 1; description { state: "default" 0.00; fixed: 1 0; - rel1 { - offset: 1 1; - to: "icon_border"; - } + rel1.to: "icon_border"; rel2 { - relative: 0.50 0.50; - offset: -2 -2; - to: "icon_border"; + relative: 0.00 0.00; + to_x: "cross_vert"; + to_y: "cross_hor"; } } } @@ -436,89 +430,15 @@ group { name: "elm/gengrid/item/image_set/default"; description { state: "default" 0.00; fixed: 1 0; rel1 { - relative: 0.50 0.00; - offset: 1 1; - to: "icon_border"; - } - rel2 { - relative: 1.00 0.50; - offset: -2 -2; - to: "icon_border"; - } - } - } - part { name: "first_border"; - type: IMAGE; - clip_to: "highlight_content"; - description { state: "default" 0.00; - image { - normal: "Custom/border_1.png"; - border: 1 1 1 1; - middle: NONE; - } - rel1.to: "icon_border"; - rel2 { - relative: 0.50 0.50; - offset: 0 -1; - to: "icon_border"; - } - } - } - part { name: "second_border"; - type: IMAGE; - clip_to: "highlight_content"; - description { state: "default" 0.00; - image { - normal: "Custom/border_1.png"; - border: 1 1 1 1; - middle: NONE; - } - rel1 { - relative: 0.50 0.00; - to: "icon_border"; - } - rel2 { - relative: 1.00 0.50; - to: "icon_border"; - } - } - } - part { name: "third_border"; - type: IMAGE; - clip_to: "highlight_content"; - description { state: "default" 0.00; - image { - normal: "Custom/border_1.png"; - border: 1 1 1 1; - middle: NONE; - } - rel1 { - relative: 0.00 0.50; - offset: 0 -1; - to: "icon_border"; + relative: 1.00 0.00; + to_x: "cross_vert"; + to_y: "icon_border"; } rel2 { - relative: 0.50 1.00; - offset: 0 -1; - to: "icon_border"; - } - } - } - part { name: "fouth_border"; - type: IMAGE; - clip_to: "highlight_content"; - description { state: "default" 0.00; - image { - normal: "Custom/border_1.png"; - border: 1 1 1 1; - middle: NONE; - } - rel1 { - relative: 0.50 0.50; - offset: 0 -1; - to: "icon_border"; + relative: 1.00 0.00; + to_x: "icon_border"; + to_y: "cross_hor"; } - rel2.to: "icon_border"; } } part { name: "elm.swallow.third"; @@ -528,13 +448,13 @@ group { name: "elm/gengrid/item/image_set/default"; fixed: 1 1; rel1 { relative: 0.00 0.50; - offset: 1 1; - to: "icon_border"; + to_x: "icon_border"; + to_y: "cross_vert"; } rel2 { - relative: 0.50 1.00; - offset: -2 -2; - to: "icon_border"; + relative: 0.00 1.00; + to_x: "cross_vert"; + to_y: "icon_border"; } } } @@ -544,29 +464,46 @@ group { name: "elm/gengrid/item/image_set/default"; description { state: "default" 0.00; fixed: 1 1; rel1 { - relative: 0.50 0.50; - offset: 1 1; - to: "icon_border"; - } - rel2 { - offset: -2 -2; - to: "icon_border"; + relative: 1.00 1.00; + to_x: "cross_vert"; + to_y: "cross_hor"; } + rel2.to: "icon_border"; } } part { name: "elm.text.count"; type: TEXT; scale: 1; + clip_to: "highlight_text"; description { state: "default" 0.00; - color_class: "gengrid_text_default"; text { - font: FN; - fit: 0 1; + font: "Breeze"; + size: 24; } rel1.to: "elm.swallow.fouth"; rel2.to: "elm.swallow.fouth"; } } + part { name: "cross_vert"; + type: RECT; + clip_to: "highlight_content"; + description { state: "default" 0.00; + min: 1 0; + max: 1 -1; + rel1.to: "icon_border"; + rel2.to: "icon_border"; + } + } + part { name: "cross_hor"; + type: RECT; + clip_to: "highlight_content"; + description { state: "default" 0.00; + min: 0 1; + max: -1 1; + rel1.to: "icon_border"; + rel2.to: "icon_border"; + } + } part { name: "elm.swallow.end"; type: SWALLOW; clip_to: "disclip"; @@ -585,23 +522,6 @@ group { name: "elm/gengrid/item/image_set/default"; } } } - part { name: "icon_border"; - type: IMAGE; - clip_to: "highlight_content"; - description { state: "default" 0.00; - image { - normal: "Custom/border_1.png"; - border: 1 1 1 1; - middle: NONE; - } - rel1.offset: 12 12; - rel2 { - relative: 1.00 0.00; - offset: -1 -7; - to_y: "elm.text"; - } - } - } part { name: "elm.text"; type: TEXT; scale: 1; @@ -609,17 +529,37 @@ group { name: "elm/gengrid/item/image_set/default"; description { state: "default" 0.00; align: 0.50 1.00; text { - font: FN; + font: "Breeze"; size: 13; max: 0 1; } - rel1.to_x: "icon_border"; + rel1 { + offset: 1 0; + to_x: "icon_border"; + } rel2 { - offset: -1 -10; + offset: -2 -4; to_x: "icon_border"; } } } + part { name: "icon_border"; + type: IMAGE; + clip_to: "highlight_content"; + description { state: "default" 0.00; + image { + normal: "Custom/border_1.png"; + border: 1 1 1 1; + middle: NONE; + } + rel1.offset: 3 3; + rel2 { + relative: 1.00 0.00; + offset: -4 -4; + to_y: "elm.text"; + } + } + } part { name: "text_bottom"; type: SPACER; description { state: "default" 0.00; @@ -648,7 +588,6 @@ group { name: "elm/gengrid/item/image_set/default"; } } } - programs { program { name: "go_active"; signal: "elm,state,selected"; @@ -678,3 +617,5 @@ group { name: "elm/gengrid/item/image_set/default"; } } } + + --
