rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=05fee4d6c57295e6e4cdd61c1b52b0aa007ffc43
commit 05fee4d6c57295e6e4cdd61c1b52b0aa007ffc43 Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Mon Feb 8 16:28:31 2016 +0200 gengrid.edc: update the sound_editor/default item accordigly to guideline Change-Id: Iff13600fe03713a5c77bdc2963e3da605aac60c8 --- data/themes/default/widgets/gengrid.edc | 214 ++++++++++++++------------------ 1 file changed, 90 insertions(+), 124 deletions(-) diff --git a/data/themes/default/widgets/gengrid.edc b/data/themes/default/widgets/gengrid.edc index 7ab93b4..26a43b3 100644 --- a/data/themes/default/widgets/gengrid.edc +++ b/data/themes/default/widgets/gengrid.edc @@ -209,72 +209,68 @@ } } -#define SOUND_EDITOR_BG_COLOR 17 70 98 255 -#define SOUND_EDITOR_HIGHLIGHT_COLOR 6 130 134 255 group { name: "elm/gengrid/item/sound_editor/default"; - data.item: "contents" "elm.swallow.icon"; - data.item: "texts" "elm.text elm.text.type"; - images { - image: "border_1.png" COMP; + data { + item: "texts" "elm.text elm.text.type"; + item: "contents" "elm.swallow.icon"; } parts { - part { name: "padding.up"; - type: SPACER; - description { state: "default" 0.0; - align: 0.0 0.0; - min: 2 2; - max: 2 2; - } - } - part { name: "padding.bottom"; - type: SPACER; - description { state: "default" 0.0; - align: 1.0 1.0; - min: 2 2; - max: 2 2; - } - } part { name: "bg"; - clip_to: "clipper"; type: RECT; description { state: "default" 0.0; - color: SOUND_EDITOR_BG_COLOR; + color_class: "select_dark"; rel1 { - relative: 1.0 1.0; - to: "padding.up"; + offset: 3 3; } rel2 { - relative: 0.0 0.0; - to_x: "padding.bottom"; + relative: 1.0 0.0; + offset: -4 -4; to_y: "elm.text"; } } } - part { name: "elm.text.type"; - clip_to: "clipper"; - type: TEXT; - mouse_events: 0; - scale: 1; + part { name: "highlight_content"; + type: RECT; description { state: "default" 0.0; - color: FN_COL_LIGHT_GREY; - rel1.to: "bg"; - rel2.to: "bg"; - text { - font: FN; - elipsis: -1; - size: 25; - min: 1 1; + visible: 0; + color_class: "select"; + rel1 { + to: "bg"; + } + rel2 { + to: "bg"; + } + } + description { state: "selected" 0.0; + color_class: "select"; + rel1 { + to: "bg"; + } + rel2 { + to: "bg"; } } } - part { name: "elm.swallow.icon"; - clip_to: "clipper"; - repeat_events: 1; - type: SWALLOW; + part { name: "highlight_text"; + type: RECT; description { state: "default" 0.0; - fixed: 1 0; - rel1.to: "bg"; - rel2.to: "bg"; + visible: 0; + color_class: "select"; + rel1 { + to: "elm.text"; + } + rel2 { + to: "elm.text"; + } + } + description { state: "selected" 0.0; + color_class: "select"; + rel1 { + to: "elm.text"; + } + rel2 { + to: "elm.text"; + } } } part { name: "elm.text"; @@ -283,111 +279,81 @@ group { name: "elm/gengrid/item/sound_editor/default"; scale: 1; description { state: "default" 0.0; align: 1.0 1.0; - color: FN_COL_LIGHT_GREY; + color_class: "main"; + color3: 255 255 255 25; rel1 { - relative: 1.0 0.0; - to_x: "padding.up"; + offset: 3 0; } rel2 { - relative: 0.0 1.0; - to_x: "padding.bottom"; + offset: -4 -4; } text { - font: FN; + text: ""; + font: "PT"; size: 11; min: 0 1; max: 0 1; align: 0.5 1.0; } } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: FN_COL_DEFAULT; - } } - part { name: "border"; - type:IMAGE; + part { name: "elm.swallow.icon"; + type: SWALLOW; + repeat_events: 1; description { state: "default" 0.0; - visible: 0; - color: SOUND_EDITOR_HIGHLIGHT_COLOR; - rel1.to: "bg"; - rel2.to: "bg"; - image { - normal: "border_1.png"; - border: 1 1 1 1; - middle: 0; + fixed: 1 0; + rel1 { + offset: 1 1; + to: "bg"; + } + rel2 { + offset: -2 -2; + to: "bg"; } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; } } - part { name: "clipper"; - type: RECT; - repeat_events: 1; + part { name: "elm.text.type"; + type: TEXT; mouse_events: 0; + scale: 1; description { state: "default" 0.0; - color: WHITE_VISIBLE_COLOR; - rel1.to: "bg"; + color_class: "main"; + color3: 255 255 255 25; + rel1 { + offset: 1 1; + to: "bg"; + } rel2 { - to_x: "bg"; - to_y: "elm.text"; - relative: 1.0 0.0; + offset: -2 -2; + to: "bg"; + } + text { + font: "PT"; + size: 25; + min: 1 1; + ellipsis: -1.0; } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: SOUND_EDITOR_HIGHLIGHT_COLOR; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: WHITE_VISIBLE_COLOR; } } } programs { - program { - name: "go_active"; - signal: "elm,state,selected"; - source: "elm"; - action: STATE_SET "selected" 0.0; - target: "elm.text"; - target: "border"; - target: "clipper"; - transition: ACCELERATE 0.1; - } - program { - name: "go_passive"; - signal: "elm,state,unselected"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - target: "border"; - target: "clipper"; - transition: ACCELERATE 0.2; + program { name: "go_active"; + signal: "elm,state,selected"; + source: "elm"; + action: STATE_SET "selected" 0.00; + target: "highlight_content"; + target: "highlight_text"; } - program { - name: "go_disabled"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "clipper"; - } - program { - name: "go_enabled"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "clipper"; + program { name: "go_passive"; + signal: "elm,state,unselected"; + source: "elm"; + action: STATE_SET "default" 0.00; + target: "highlight_content"; + target: "highlight_text"; } } } -#undef SOUND_EDITOR_BG_COLOR -#undef SOUND_EDITOR_HIGHLIGHT_COLOR -#undef BORDER_PADDING - group { name: "elm/gengrid/item/group_index/default"; data { item: "texts" "elm.text"; --