From a7110bd0636ef0f0999dae209183823a4479231d Mon Sep 17 00:00:00 2001 From: Sungtaek Hong Date: Thu, 5 Jan 2017 13:39:56 +0900 Subject: [PATCH] theme: update color_class for elm widgets Change-Id: I33cbbf6cdbc72b5cd8e0c93001785d7b4c514460 Signed-off-by: Sungtaek Hong --- ElmSharp/theme/tv/color_classes.edc | 236 +++++++++++++++++++++++++++ ElmSharp/theme/tv/widgets/button.edc | 43 ++++- ElmSharp/theme/tv/widgets/check.edc | 59 ++++++- ElmSharp/theme/tv/widgets/ctxpopup.edc | 11 +- ElmSharp/theme/tv/widgets/datetime.edc | 23 ++- ElmSharp/theme/tv/widgets/entry.edc | 16 +- ElmSharp/theme/tv/widgets/gengrid.edc | 4 +- ElmSharp/theme/tv/widgets/genlist.edc | 4 +- ElmSharp/theme/tv/widgets/genlist_common.edc | 40 +++++ ElmSharp/theme/tv/widgets/hoversel.edc | 32 ++-- ElmSharp/theme/tv/widgets/popup.edc | 7 +- ElmSharp/theme/tv/widgets/progressbar.edc | 16 +- ElmSharp/theme/tv/widgets/radio.edc | 15 +- ElmSharp/theme/tv/widgets/scroller.edc | 97 ++++++++++- ElmSharp/theme/tv/widgets/slider.edc | 1 + ElmSharp/theme/tv/widgets/spinner.edc | 4 +- 16 files changed, 538 insertions(+), 70 deletions(-) diff --git a/ElmSharp/theme/tv/color_classes.edc b/ElmSharp/theme/tv/color_classes.edc index c3ad645..e83b3ce 100644 --- a/ElmSharp/theme/tv/color_classes.edc +++ b/ElmSharp/theme/tv/color_classes.edc @@ -1,9 +1,245 @@ color_classes { /* + * Button + */ + color_class { "button/default/bg"; + color: 204 204 204 255; + } + color_class { "button/default/bg_focused"; + color: 69 143 255 255; + color2: 69 143 255 255; + color3: 69 143 255 255; + } + color_class { "button/default/bg_disabled"; + color: 69 143 255 102; + color2: 69 143 255 102; + color3: 69 143 255 102; + } + color_class { "button/default/text"; + color: 89 89 89 255; + } + color_class { "button/default/text_focused"; + color: 255 255 255 255; + } + color_class { "button/default/text_disabled"; + color: 89 89 89 102; + } + /* + * Check + */ + color_class { "check/default/bg"; + color: 0 0 0 0; + } + color_class { "check/default/bg_disabled"; + color: 0 0 0 0; + } + color_class { "check/default/bg_on"; + color: 0 0 0 0; + } + color_class { "check/default/bg_on_disabled"; + color: 0 0 0 0; + } + color_class { "check/default/text"; + color: 0 0 0 255; + } + color_class { "check/default/text_disabled"; + color: 0 0 0 128; + color3: 0 0 0 0; + } + /* + * Ctxpopup + */ + color_class { "ctxpopup/default/bg"; + color: 0 0 0 0; + } + color_class { "ctxpopup_item/default/effect"; + color: 61 185 204 77; + } + color_class { "ctxpopup_item/default/divider"; + color: 222 222 222 255; + } + color_class { "ctxpopup_item/default/text"; + color: 89 89 89 255; + } + color_class { "ctxpopup_item/default/text_focused"; + color: 255 255 255 255; + } + color_class { "ctxpopup_item/default/text_disabled"; + color: 0 0 0 255; + } + /* + * Datetime + */ + color_class { "datetime/default/bg"; + color: 250 250 250 255; + } + color_class { "datetime/date_layout/bg"; + color: 250 250 250 255; + } + color_class { "datetime/time_layout/bg"; + color: 250 250 250 255; + } + color_class { "datetime/time_layout_24hr/bg"; + color: 250 250 250 255; + } + /* + * Entry + */ + color_class { "entry/default/text_edit"; + color: 204 204 204 255; + } + color_class { "entry/default/text_edit_focused"; + color: 61 61 61 255; + } + color_class { "entry/default/text_edit_disabled"; + color: 145 145 145 255; + } + color_class { "entry/default/text_edit_guide"; + color: 127 127 127 255; + } + /* + * Gengrid + */ + color_class { "gengrid/default/bg"; + color: 255 255 255 0; + } + color_class { "gengrid_item/default/bg"; + color: 0 0 0 179; + } + color_class { "gengrid_item/default/effect"; + color: 147 170 0 255; + } + /* + * Genlist + */ + color_class { "genlist/default/bg"; + color: 255 255 255 0; + } + color_class { "genlist_item/default/bg"; + color: 255 255 255 255; + } + color_class { "genlist_item/default/bg_selected"; + color: 69 143 255 255; + } + color_class { "genlist_item/default/bg_focused"; + color: 69 143 255 255; + } + color_class { "genlist_item/default/bottomline"; + color: 222 222 222 222; + } + /* + * Hoversel + */ + color_class { "hoversel/default/bg"; + color: 0 0 0 76; + } + color_class { "hoversel/default/bg_focused"; + color: 69 143 255 255; + color2: 69 143 255 255; + color3: 69 143 255 255; + } + color_class { "hoversel/default/bg_disabled"; + color: 0 0 0 25; + } + color_class { "hoversel/default/text"; + color: 175 175 175 255; + } + color_class { "hoversel/default/text_focused"; + color: 255 255 255 255; + } + color_class { "hoversel/default/text_disabled"; + color: 175 175 175 102; + } + // FIXME: temporarily add new color_class because of + // diff between disabled texts. + color_class { "hoversel/default/text_disabled_visible"; + color: 158 158 158 102; + color3: 0 0 0 0; + } + color_class { "hoversel_item/default/bg"; + color: 255 255 255 255; + } + color_class { "hoversel_item/default/bg_focused"; + color: 69 143 255 255; + color2: 69 143 255 255; + color3: 69 143 255 255; + } + color_class { "hoversel_item/default/bg_highlight"; + color: 255 255 255 255; + } + color_class { "hoversel_item/default/bg_focused_highlight"; + color: 69 143 255 255; + color2: 69 143 255 255; + color3: 69 143 255 255; + } + color_class { "hoversel_item/default/bg_disabled"; + color: 255 255 255 255; + } + /* * Layout */ color_class { name: "layout/background/bg"; color: 0 0 0 0; } + /* + * Popup + */ + color_class { "popup/default/bg_content"; + color: 255 255 255 255; + } + color_class { "popup/default/bg_title"; + color: 42 76 130 255; + } + color_class { "popup/default/text_maintitle"; + color: 255 255 255 255; + } + color_class { "popup/default/text_content"; + color: 0 0 0 255; + } + /* + * Progressbar + */ + color_class { "progressbar/default/bg"; + color: 255 255 255 26; + } + color_class { "progressbar/default/bar"; + color: 255 255 255 178; + } + /* + * Radio + */ + color_class { "radio/default/bg"; + color: 0 0 0 0; + } + color_class { "radio/default/stroke"; + color: 255 255 255 255; + } + color_class { "radio/default/stroke_focused"; + color: 255 255 255 255; + } + color_class { "radio/default/stroke_disabled"; + color: 255 255 255 51; + } + color_class { "radio/default/icon"; + color: 255 255 255 255; + } + color_class { "radio/default/icon_focused"; + color: 255 255 255 255; + } + /* + * Slider + */ + color_class { "slider/default/bg"; + color: 255 255 255 255; + } + /* + * Spinner + */ + color_class { "spinner/default/bg"; + color: 255 255 255 255; + } + color_class { "spinner/vertical/bg"; + color: 250 250 250 255; + } } diff --git a/ElmSharp/theme/tv/widgets/button.edc b/ElmSharp/theme/tv/widgets/button.edc index d8387ea..d240d0a 100644 --- a/ElmSharp/theme/tv/widgets/button.edc +++ b/ElmSharp/theme/tv/widgets/button.edc @@ -73,7 +73,7 @@ group { name: "elm/button/base/default"; rel1.to: "base"; rel2.to: "base"; min: BUTTON_DEFAULT_MIN_SIZE; - color: 204 204 204 255; + color_class: "button/default/bg"; image { normal: "round_rectangle_4X4.png"; border: BUTTON_BORDER; @@ -82,11 +82,11 @@ group { name: "elm/button/base/default"; } description { state: "focus" 0.0; inherit: "default" 0.0; - color_class: "open_ux_theme"; + color_class: "button/default/bg_focused"; } description { state: "dim" 0.0; inherit: "default" 0.0; - color_class: "open_ux_theme_alpha"; + color_class: "button/default/bg_disabled"; } } part { name: "elm.swallow.content"; type: SWALLOW; @@ -109,7 +109,7 @@ group { name: "elm/button/base/default"; rel1.relative: 1.0 0.0; rel2.to_x: "pad.right"; rel2.relative: 0.0 1.0; - color: 89 89 89 255; + color_class: "button/default/text"; text { font: FONT_M;//TODO Tizen Sans regular size: BUTTON_DEFAULT_FONT_SIZE; @@ -121,12 +121,12 @@ group { name: "elm/button/base/default"; } description { state: "focus" 0.0; inherit: "default" 0.0; - color: WHITE 255; + color_class: "button/default/text_focused"; text.min: 1 1; } description { state: "dim" 0.0; inherit: "default" 0.0; - color: 89 89 89 102; + color_class: "button/default/text_disabled"; } } part { name: "event"; type: RECT; @@ -1580,6 +1580,37 @@ styles { } } } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + script { + set_int(disabled, 1); + if (get_int(animate) == 1) return; + if (get_int(selected) == 1) { + set_state(PART:"clipper", "disabled", 0.0); + set_state(PART:"tizen_vg_shape_clipper", "disabled", 0.0); + set_state(PART:"elm.text", "disabled", 0.0); + } + else { + set_state(PART:"elm.text", "disabled", 0.0); + } + } + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + script { + set_int(disabled, 0); + if (get_int(selected) == 1){ + set_state(PART:"clipper", "default", 0.0); + set_state(PART:"tizen_vg_shape_clipper", "default", 0.0); + set_state(PART:"elm.text", "default", 0.0); + } + else { + set_state(PART:"elm.text", "default", 0.0); + } + } + } } /***********************SPINNER BUTTONS STYLES******************************/ diff --git a/ElmSharp/theme/tv/widgets/check.edc b/ElmSharp/theme/tv/widgets/check.edc index 3b30023..edd278e 100644 --- a/ElmSharp/theme/tv/widgets/check.edc +++ b/ElmSharp/theme/tv/widgets/check.edc @@ -40,6 +40,7 @@ group { name: "elm/check/base/default"; data.item: "focus_highlight" "on"; script { public is_focus=0; + public is_disabled=0; public set_focus() { set_int(is_focus, 1); } @@ -55,6 +56,12 @@ group { name: "elm/check/base/default"; set_state(PART:"check", "visible", 0.0); set_state(PART:"bg", "default", 0.0); } + if (get_int(is_disabled)) { + set_state(PART:"background", "on_disabled", 0.0); + } + else { + set_state(PART:"background", "on", 0.0); + } } public set_check_unset() { set_state(PART:"check", "default", 0.0); @@ -64,9 +71,34 @@ group { name: "elm/check/base/default"; else { set_state(PART:"bg", "default", 0.0); } + if (get_int(is_disabled)) { + set_state(PART:"background", "disabled", 0.0); + } + else { + set_state(PART:"background", "default", 0.0); + } } } parts { + part { name: "background"; mouse_events: 0; + type: RECT; + description { state: "default" 0.0; + rel.to: "bg"; + color_class: "check/default/bg"; + } + description { state: "disabled"; + inherit: "default" 0.0; + color_class: "check/default/bg_disabled"; + } + description { state: "on"; + inherit: "default" 0.0; + color_class: "check/default/bg_on"; + } + description { state: "on_disabled"; + inherit: "default" 0.0; + color_class: "check/default/bg_on_disabled"; + } + } part { name: "bg"; mouse_events: 0; scale: 1; description { state: "default" 0.0; @@ -156,7 +188,7 @@ group { name: "elm/check/base/default"; rel1.relative: 1.0 0.0; rel2.to: "pad.elm.text"; rel2.relative: 0.0 1.0; - color: 0 0 0 255; + color_class: "check/default/text"; text { font: FONT_L; size: CHECK_FONT_SIZE; @@ -172,13 +204,11 @@ group { name: "elm/check/base/default"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 0 0 0 128; - color3: 0 0 0 0; + color_class: "check/default/text_disabled"; } description { state: "disabled_visible" 0.0; inherit: "default" 0.0; - color: 0 0 0 128; - color3: 0 0 0 0; + color_class: "check/default/text_disabled"; visible: 1; text.min: 1 1; text.ellipsis: -1; @@ -305,6 +335,8 @@ group { name: "elm/check/base/default"; script { new st[31]; new Float:vl; + set_int(is_disabled, 1); + get_state(PART:"elm.text", st, 30, vl); if (!strcmp(st, "visible")) set_state(PART:"elm.text", "disabled_visible", 0.0); @@ -318,10 +350,14 @@ group { name: "elm/check/base/default"; set_state(PART:"elm.swallow.content", "disabled", 0.0); get_state(PART:"check", st, 30, vl); - if (!strcmp(st, "visible")) + if (!strcmp(st, "visible")) { set_state(PART:"check", "disabled_visible", 0.0); - else + set_state(PART:"background", "on_disabled", 0.0); + } + else { set_state(PART:"check", "disabled", 0.0); + set_state(PART:"background", "disabled", 0.0); + } } } program { name: "enable"; @@ -335,6 +371,7 @@ group { name: "elm/check/base/default"; script { new st[31]; new Float:vl; + set_int(is_disabled, 0); get_state(PART:"elm.text", st, 30, vl); if (!strcmp(st, "disabled_visible")) set_state(PART:"elm.text", "visible", 0.0); @@ -348,10 +385,14 @@ group { name: "elm/check/base/default"; set_state(PART:"elm.swallow.content", "default", 0.0); get_state(PART:"check", st, 30, vl); - if (!strcmp(st, "disabled_visible")) + if (!strcmp(st, "disabled_visible")) { set_state(PART:"check", "visible", 0.0); - else + set_state(PART:"background", "on", 0.0); + } + else { set_state(PART:"check", "default", 0.0); + set_state(PART:"background", "default", 0.0); + } } } } diff --git a/ElmSharp/theme/tv/widgets/ctxpopup.edc b/ElmSharp/theme/tv/widgets/ctxpopup.edc index f23d5e1..2e37251 100644 --- a/ElmSharp/theme/tv/widgets/ctxpopup.edc +++ b/ElmSharp/theme/tv/widgets/ctxpopup.edc @@ -69,7 +69,7 @@ group { name: "elm/ctxpopup/base/default"; part { name: "base"; type: RECT; clip_to: "clip"; description { state: "default" 0.0; - color: 0 0 0 0; + color_class: "ctxpopup/default/bg"; } } part { name: "elm.swallow.content"; type: SWALLOW; @@ -321,6 +321,7 @@ group { description { state: "clicked" 0.0; inherit: "default" 0.0; color: 255 255 255 255; + color_class: "ctxpopup_item/default/effect"; } } part { name: "elm.proxy1.icon"; @@ -380,7 +381,7 @@ group { rel1.to_x: "elm.swallow.icon"; rel2.to_x: "elm.proxy2.icon"; rel2.relative: 1.0 1.0; - color: 89 89 89 255; + color_class: "ctxpopup_item/default/text"; text { font: "FONT_M"; size: 30; @@ -391,11 +392,11 @@ group { } description { state: "focus" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "ctxpopup_item/default/text_focused"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 0 0 0 255; + color_class: "ctxpopup_item/default/text_disabled"; } } part { name: "over1"; type: RECT; mouse_events: 1; @@ -419,7 +420,7 @@ group { rel1.relative: 0 1; rel1.offset: -32 0; rel2.to:"over1"; - color: 222 222 222 255; + color_class: "ctxpopup_item/default/divider"; } } diff --git a/ElmSharp/theme/tv/widgets/datetime.edc b/ElmSharp/theme/tv/widgets/datetime.edc index 5421038..727725d 100644 --- a/ElmSharp/theme/tv/widgets/datetime.edc +++ b/ElmSharp/theme/tv/widgets/datetime.edc @@ -35,7 +35,7 @@ group { name: "elm/datetime/base/default"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 250 250 250 255; + color_class: "datetime/default/bg"; } } part { name: "base"; @@ -264,6 +264,18 @@ group { name: "elm/datetime/base/default"; } } } +group { name: "elm/datetime/base/date_layout"; + inherit: "elm/datetime/base/default"; + parts { + part { name: "base_bg"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + color_class: "datetime/date_layout/bg"; + } + } + } +} group { name: "elm/datetime/base/time_layout"; parts { @@ -271,7 +283,7 @@ group { name: "elm/datetime/base/time_layout"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 250 250 250 255; + color_class: "datetime/time_layout/bg"; } } part { name: "base"; @@ -674,6 +686,13 @@ group { name: "elm/datetime/base/time_layout_24hr"; inherit: "elm/datetime/base/time_layout"; parts { + part { name: "base_bg"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + color_class: "datetime/time_layout_24hr/bg"; + } + } part { name: "base"; type: SPACER; scale: 1; diff --git a/ElmSharp/theme/tv/widgets/entry.edc b/ElmSharp/theme/tv/widgets/entry.edc index e8fcd3f..fe479ad 100644 --- a/ElmSharp/theme/tv/widgets/entry.edc +++ b/ElmSharp/theme/tv/widgets/entry.edc @@ -37,7 +37,7 @@ styles { style { name: "entry_single_textblock_style"; - base: "font="FONT_M" font_size="32" align=left color=#cccccc wrap=none text_class=entry left_margin=0 right_margin=0"; + base: "font="FONT_M" font_size="32" align=left color=#FFF wrap=none text_class=entry left_margin=0 right_margin=0 color_class=entry/default/text_edit"; tag: "br" ""; tag: "ps" ""; tag: "em" "+ font_style=Oblique"; @@ -47,7 +47,7 @@ styles tag: "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF"; } style { name: "entry_single_textblock_selected_style"; - base: "font="FONT_M" font_size="32" align=left color=#3d3d3d wrap=none text_class=entry left_margin=0 right_margin=0"; + base: "font="FONT_M" font_size="32" align=left color=#FFF wrap=none text_class=entry left_margin=0 right_margin=0 color_class=entry/default/text_edit_focused"; tag: "br" ""; tag: "ps" ""; tag: "em" "+ font_style=Oblique"; @@ -57,7 +57,7 @@ styles tag: "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF"; } style { name: "entry_single_textblock_disabled_style"; - base: "font="FONT_M" font_size="32" align=left color=#919191 wrap=none text_class=entry left_margin=0 right_margin=0"; + base: "font="FONT_M" font_size="32" align=left color=#FFF wrap=none text_class=entry left_margin=0 right_margin=0 color_class=entry/default/text_edit_disabled"; tag: "br" ""; tag: "ps" ""; tag: "em" "+ font_style=Oblique"; @@ -67,7 +67,7 @@ styles tag: "preedit_sel" "+ backing=on backing_color=#000 color=#FFFFFF"; } style { name: "entry_single_textblock_guide_style"; - base: "font="FONT_M" font_size="32" align=left color=#7f7f7f wrap=none text_class=entry left_margin=0 right_margin=0 ellipsis=0.0"; + base: "font="FONT_M" font_size="32" align=left color=#FFF wrap=none text_class=entry left_margin=0 right_margin=0 ellipsis=0.0 color_class=entry/default/text_guide"; tag: "br" ""; tag: "ps" ""; tag: "em" "+ font_style=Oblique"; @@ -77,7 +77,7 @@ styles styles { style { name: "entry_textblock_style"; - base: "font="FONT_M" font_size="32" align=left color=#cccccc wrap=none text_class=entry left_margin=0 right_margin=0"; + base: "font="FONT_M" font_size="32" align=left color=#FFF wrap=none text_class=entry left_margin=0 right_margin=0 color_class=entry/default/text_edit"; tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#800 underline=on underline_color=#8008"; tag: "hilight" "+ font_weight=Bold"; @@ -85,7 +85,7 @@ styles tag: "preedit_sel" "+ backing=on backing_color=#000 color=#000"; } style { name: "entry_textblock_selected_style"; - base: "font="FONT_M" font_size="32" align=left color=#3d3d3d wrap=none text_class=entry left_margin=0 right_margin=0"; + base: "font="FONT_M" font_size="32" align=left color=#FFF wrap=none text_class=entry left_margin=0 right_margin=0 color_class=entry/default/text_focused"; tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#800 underline=on underline_color=#8008"; tag: "hilight" "+ font_weight=Bold"; @@ -93,7 +93,7 @@ styles tag: "preedit_sel" "+ backing=on backing_color=#000 color=#000"; } style { name: "entry_textblock_disabled_style"; - base: "font="FONT_M" font_size="32" align=left color=#3d3d3d wrap=none text_class=entry left_margin=0 right_margin=0"; + base: "font="FONT_M" font_size="32" align=left color=#FFF wrap=none text_class=entry left_margin=0 right_margin=0 color_class=entry/default/text_edit_disabled"; tag: "em" "+ font_style=Oblique"; tag: "link" "+ color=#00000080 underline=on underline_color=#00000080"; tag: "hilight" "+ font_weight=Bold"; @@ -101,7 +101,7 @@ styles tag: "preedit_sel" "+ backing=on backing_color=#000 color=#000"; } style { name: "entry_textblock_guide_style"; - base: "font="FONT_M" font_size="32" align=left color=#7f7f7f wrap=none text_class=entry left_margin=0 right_margin=0 ellipsis=0.0"; + base: "font="FONT_M" font_size="32" align=left color=#FFF wrap=none text_class=entry left_margin=0 right_margin=0 ellipsis=0.0 color_class=entry/default/text_guide"; tag: "em" "+ font_style=Oblique"; tag: "hilight" "+ font_weight=Bold"; } diff --git a/ElmSharp/theme/tv/widgets/gengrid.edc b/ElmSharp/theme/tv/widgets/gengrid.edc index bb5cd53..fcb1754 100644 --- a/ElmSharp/theme/tv/widgets/gengrid.edc +++ b/ElmSharp/theme/tv/widgets/gengrid.edc @@ -39,7 +39,7 @@ group { name: "elm/gengrid/item/default/default"; part { name: "base"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 0 0 0 179; + color_class: "gengrid_item/default/bg"; rel1 { relative: 1.0 1.0; to: "top.left.pad"; @@ -51,7 +51,7 @@ group { name: "elm/gengrid/item/default/default"; } description { state: "focused" 0.0; inherit: "default" 0.0; - color: 147 170 0 255; + color_class: "gengrid_item/default/effect"; } } part { name: "top.left.pad"; type: SPACER; diff --git a/ElmSharp/theme/tv/widgets/genlist.edc b/ElmSharp/theme/tv/widgets/genlist.edc index c40665e..ebb1611 100644 --- a/ElmSharp/theme/tv/widgets/genlist.edc +++ b/ElmSharp/theme/tv/widgets/genlist.edc @@ -34,9 +34,9 @@ group { "elm/genlist/item/1text/default"; nomouse; program_source: "elm"; target_group: "default" "base" "bottom_line" "elm.text"; target_group: "disabled" "event" "elm.text"; parts { - GENLIST_BASE(255 255 255 255, 69 143 255 255) + GENLIST_BASE_COLOR_CLASS("genlist_item/default/bg", "genlist_item/default/bg_selected", "genlist_item/default/bg_focused") GENLIST_PAD(40, 40, 20, 20) - GENLIST_BOTTOM_LINE(222 222 222 222) + GENLIST_BOTTOM_LINE_COLOR_CLASS("genlist_item/default/bottomline") text { "elm.text"; scale; desc { "default"; rel1.to: "pad.top.left"; diff --git a/ElmSharp/theme/tv/widgets/genlist_common.edc b/ElmSharp/theme/tv/widgets/genlist_common.edc index 1b2b007..4b67fb4 100644 --- a/ElmSharp/theme/tv/widgets/genlist_common.edc +++ b/ElmSharp/theme/tv/widgets/genlist_common.edc @@ -97,6 +97,31 @@ } \ } +#define GENLIST_BASE_COLOR_CLASS(COLOR_CLASS, COLOR_CLASS_SELECTED, COLOR_CLASS_FOCUSED) \ + rect { "event"; mouse; \ + desc { "default"; \ + color: 0 0 0 0; \ + } \ + desc { "disabled"; \ + inherit: "default"; \ + hid; \ + } \ + } \ + rect { "base"; \ + scale; \ + desc { "default"; \ + color_class: COLOR_CLASS; \ + } \ + desc { "selected"; \ + inherit: "default"; \ + color_class: COLOR_CLASS_SELECTED; \ + } \ + desc { "focused"; \ + inherit: "default"; \ + color_class: COLOR_CLASS_FOCUSED; \ + } \ + } + #define GENLIST_PAD(LEFT, RIGHT, TOP, BOTTOM) \ spacer { "pad.top.left"; \ scale; \ @@ -132,6 +157,21 @@ } \ } +#define GENLIST_BOTTOM_LINE_COLOR_CLASS(COLOR_CLASS) \ + rect { "bottom_line"; \ + desc { "default"; \ + fixed: 0 1; \ + min: 0 1; \ + rel1.relative: 0.0 1.0; \ + align: 0.5 1.0; \ + color_class: COLOR_CLASS; \ + } \ + desc { "focused"; \ + inherit: "default"; \ + hid; \ + } \ + } + #define GENLIST_PROGRAMS(TARGET, TARGET_DISABLE) \ program { name: "selected"; \ signal: "elm,state,selected"; \ diff --git a/ElmSharp/theme/tv/widgets/hoversel.edc b/ElmSharp/theme/tv/widgets/hoversel.edc index 0db5b42..e8031c2 100644 --- a/ElmSharp/theme/tv/widgets/hoversel.edc +++ b/ElmSharp/theme/tv/widgets/hoversel.edc @@ -92,7 +92,7 @@ group { name: "elm/button/base/hoversel_vertical/default"; description { state: "default" 0.0; rel1.to: "base"; rel2.to: "base"; - color: 0 0 0 76; + color_class: "hoversel/default/bg"; image { normal: "round_rectangle_4X4.png"; border: 4 4 4 4; @@ -101,12 +101,11 @@ group { name: "elm/button/base/hoversel_vertical/default"; } description { state: "focus" 0.0; inherit: "default" 0.0; - color_class: "open_ux_theme"; - color: 255 255 255 255; + color_class: "hoversel/default/bg_focused"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 0 0 0 25; + color_class: "hoversel/default/bg_disabled"; } } part { name: "down_icon"; @@ -131,7 +130,7 @@ group { name: "elm/button/base/hoversel_vertical/default"; rel2.relative: 0.0 1.0; align: 0 0.5; fixed: 1 1; - color: 175 175 175 255; + color_class: "hoversel/default/text"; text { size: HOVERSEL_FONT_SIZE; max: 1 0; @@ -141,7 +140,7 @@ group { name: "elm/button/base/hoversel_vertical/default"; } description { state: "focus" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "hoversel/default/text_focused"; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -149,11 +148,11 @@ group { name: "elm/button/base/hoversel_vertical/default"; description { state: "disabled" 0.0; inherit: "default" 0.0; color: 175 175 175 102; + color_class: "hoversel/default/text_disabled"; } description { state: "disabled_visible" 0.0; inherit: "default" 0.0; - color: 158 158 158 102; - color3: 0 0 0 0; + color_class: "hoversel/default/text_disabled_visible"; } } part { name: "pad.text"; type: SPACER; @@ -393,20 +392,23 @@ group { name: "elm/button/base/hoversel_vertical_entry/default"; description { state: "default" 0.0; rel1.to: "base"; rel2.to: "base"; + color_class: "hoversel_item/default/bg"; } description { state: "focus" 0.0; inherit: "default" 0.0; - color_class: "open_ux_theme"; + color_class: "hoversel_item/default/bg_focused"; } description { state: "highlight" 0.0; inherit: "default" 0.0; + color_class: "hoversel_item/default/bg_highlight"; } description { state: "highlight_focus" 0.0; inherit: "default" 0.0; - color_class: "open_ux_theme"; + color_class: "hoversel_item/default/bg_focused_highlight"; } description { state: "disabled" 0.0; inherit: "default" 0.0; + color_class: "hoversel_item/default/bg_disabled"; } } part { name: "pad.last_item"; type: SPACER; @@ -424,8 +426,7 @@ group { name: "elm/button/base/hoversel_vertical_entry/default"; part { name: "button_image_last"; scale: 1; clip_to: "clipper.last_item"; - description - { state: "default" 0.0; + description { state: "default" 0.0; rel1.to: "pad.last_item"; rel2.to: "base"; image { @@ -433,20 +434,23 @@ group { name: "elm/button/base/hoversel_vertical_entry/default"; border: 4 4 4 4; border_scale: 1; } + color_class: "open_ux_theme"; } description { state: "focus" 0.0; inherit: "default" 0.0; - color_class: "open_ux_theme"; + color_class: "hoversel_item/default/bg_focused"; } description { state: "highlight" 0.0; inherit: "default" 0.0; + color_class: "hoversel_item/default/bg_highlight"; } description { state: "highlight_focus" 0.0; inherit: "default" 0.0; - color_class: "open_ux_theme"; + color_class: "hoversel_item/default/bg_focused_highlight"; } description { state: "disabled" 0.0; inherit: "default" 0.0; + color_class: "hoversel_item/default/bg_disabled"; } } part { name: "list_division"; type: RECT; diff --git a/ElmSharp/theme/tv/widgets/popup.edc b/ElmSharp/theme/tv/widgets/popup.edc index f568883..2138bba 100644 --- a/ElmSharp/theme/tv/widgets/popup.edc +++ b/ElmSharp/theme/tv/widgets/popup.edc @@ -80,7 +80,7 @@ group { name: "elm/popup/base/default"; } styles { style { name: "popup_title_style"; - base: "font=Tizen:style=Regular align=center font_size="POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC" color=#FFFFFF wrap=mixed ellipsis=1.0"; + base: "font=Tizen:style=Regular align=center font_size="POPUP_BASE_DEFAULT_TEXT_FONT_SIZE_INC" color=#FFF wrap=mixed ellipsis=1.0 color_class=popup/default/text_maintitle"; tag: "br" "\n"; tag: "tab" "\t"; } @@ -109,6 +109,7 @@ group { name: "elm/popup/base/default"; normal: "modal_dialogs_bg.png"; border: 18 18 15 21; } + color_class: "popup/default/bg_content"; } } part { name: "access.outline"; @@ -126,7 +127,6 @@ group { name: "elm/popup/base/default"; scale: 1; description { state: "default" 0.0; fixed: 1 1; - color: 42 76 130 255; align: 0.5 0.0; min: 0 84; rel1 { @@ -144,6 +144,7 @@ group { name: "elm/popup/base/default"; border: 8 8 8 0; } visible: 0; + color_class: "popup/default/bg_title"; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -359,7 +360,7 @@ group { name: "elm/popup/content/default"; group { name: "elm/label/base/popup/default"; styles { style { name: "textblock_style"; - base: "font=Tizen:style=Regular font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=center color=#000000 wrap=mixed"; + base: "font=Tizen:style=Regular font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=center color=#FFF wrap=mixed color_class=popup/default/text_content"; tag: "br" "\n"; tag: "ps" "ps"; tag: "hilight" "+ font_weight=Bold"; diff --git a/ElmSharp/theme/tv/widgets/progressbar.edc b/ElmSharp/theme/tv/widgets/progressbar.edc index ff31bcf..14de12e 100644 --- a/ElmSharp/theme/tv/widgets/progressbar.edc +++ b/ElmSharp/theme/tv/widgets/progressbar.edc @@ -153,7 +153,7 @@ group { name: "elm/progressbar/horizontal/default"; description { state: "default" 0.0; rel1.to: "elm.swallow.bar"; rel2.to: "elm.swallow.bar"; - color: 255 255 255 26; + color_class: "progressbar/default/bg"; } } part { name: "elm.text.status"; type: TEXT; mouse_events: 0; @@ -194,7 +194,7 @@ group { name: "elm/progressbar/horizontal/default"; to_y: "elm.swallow.bar"; to_x: "elm.cur.progressbar"; } - color: 255 255 255 178; + color_class: "progressbar/default/bar"; } description { state: "invert" 0.0; inherit: "default" 0.0; @@ -372,14 +372,6 @@ group { name: "elm/progressbar/horizontal/default"; rel2.to: "elm.progress.progressbar"; } } - part { name: "tmp"; type: RECT; mouse_events: 0; - repeat_events: 1; - description { state: "default" 0.0; - rel1.to: "elm.swallow.bar"; - rel2.to: "elm.swallow.bar"; - color: 255 0 0 0; - } - } } programs { program { name: "label_show"; @@ -557,7 +549,7 @@ group { name: "elm/progressbar/vertical/default"; description { state: "default" 0.0; rel1.to: "elm.swallow.bar"; rel2.to: "elm.swallow.bar"; - color: 255 255 255 26; + color_class: "progressbar/default/bg"; } } part { name: "elm.progress.progressbar"; type: RECT; mouse_events: 0; @@ -571,7 +563,7 @@ group { name: "elm/progressbar/vertical/default"; to_x: "elm.swallow.bar"; to_y: "elm.cur.progressbar"; } - color: 255 255 255 178; + color_class: "progressbar/default/bar"; } description { state: "invert" 0.0; inherit: "default" 0.0; diff --git a/ElmSharp/theme/tv/widgets/radio.edc b/ElmSharp/theme/tv/widgets/radio.edc index b94c1bc..30f48db 100644 --- a/ElmSharp/theme/tv/widgets/radio.edc +++ b/ElmSharp/theme/tv/widgets/radio.edc @@ -67,6 +67,15 @@ group { name: "elm/radio/base/default"; } } parts { + part { name: "background"; + mouse_events: 0; + scale: 1; + type: RECT; + description { state: "default" 0.0; + rel.to: "bg"; + color_class: "radio/default/bg"; + } + } part { name: "bg"; mouse_events: 0; scale: 1; @@ -78,6 +87,7 @@ group { name: "elm/radio/base/default"; aspect: 1.0 1.0; aspect_preference: VERTICAL; image.normal: "radiobtn_off_nor.png"; + color_class: "radio/default/stroke"; } description { state: "invisible" 0.0; inherit: "default" 0.0; @@ -86,10 +96,11 @@ group { name: "elm/radio/base/default"; description { state: "highlight" 0.0; inherit: "default" 0.0; image.normal: "radiobtn_off_foc.png"; + color_class: "radio/default/stroke_focused"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 51; + color_class: "radio/default/stroke_disabled"; } } part { name: "radio"; @@ -100,11 +111,13 @@ group { name: "elm/radio/base/default"; rel2.to: "bg"; image.normal: "radiobtn_on_nor.png"; visible: 0; + color_class: "radio/default/icon"; } description { state: "highlight" 0.0; inherit: "default" 0.0; image.normal: "radiobtn_on_foc.png"; visible: 1; + color_class: "radio/default/icon_focused"; } description { state: "visible" 0.0; inherit: "default" 0.0; diff --git a/ElmSharp/theme/tv/widgets/scroller.edc b/ElmSharp/theme/tv/widgets/scroller.edc index 178a43d..043d812 100644 --- a/ElmSharp/theme/tv/widgets/scroller.edc +++ b/ElmSharp/theme/tv/widgets/scroller.edc @@ -29,8 +29,6 @@ DOC: Tizen TV_General Guide_GUI Guideline_v1.0_140430.ppt page : 61 style: black ****************************************************************************/ group { name: "elm/scroller/base/default"; alias: "elm/list/base/default"; - alias: "elm/genlist/base/default"; - alias: "elm/gengrid/base/default"; alias: "elm/scroller/base/map_bubble"; alias: "elm/genscroller/base/default"; @@ -562,6 +560,31 @@ group { name: "elm/scroller/base/default"; } } } + +group { name: "elm/genlist/base/default"; + inherit: "elm/scroller/base/default"; + parts { + part { name: "bg"; type: RECT; + description { state: "default" 0.0; + color: 255 255 255 255; + color_class: "genlist/default/bg"; + } + } + } +} + +group { name: "elm/gengrid/base/default"; + inherit: "elm/scroller/base/default"; + parts { + part { name: "bg"; type: RECT; + description { state: "default" 0.0; + color: 255 255 255 255; + color_class: "gengrid/default/bg"; + } + } + } +} + /******************************************************************************** DOC: Tizen TV_General Guide_GUI Guideline_v1.0_140430.ppt page : 61 style: white * ******************************************************************************/ @@ -587,14 +610,46 @@ group { name: "elm/scroller/base/white"; } } +group { name: "elm/genlist/base/white"; + inherit: "elm/genlist/base/default"; + + parts { + part { name: "elm.dragable.vbar"; + description { state: "default" 0.0; + color: 255 255 255 25; + } + } + part { name: "elm.dragable.hbar"; + description { state: "default" 0.0; + color: 255 255 255 25; + } + } + } +} + +group { name: "elm/gengrid/base/white"; + inherit: "elm/gengrid/base/default"; + + parts { + part { name: "elm.dragable.vbar"; + description { state: "default" 0.0; + color: 255 255 255 25; + } + } + part { name: "elm.dragable.hbar"; + description { state: "default" 0.0; + color: 255 255 255 25; + } + } + } +} + /******************************************************************************** DOC: Tizen TV_General Guide_GUI Guideline_v1.0_140430.ppt page : 70 style: white ********************************************************************************/ group { name: "elm/scroller/base/no_bar"; inherit: "elm/scroller/base/default"; alias: "elm/list/base/no_bar"; - alias: "elm/genlist/base/no_bar"; - alias: "elm/gengrid/base/no_bar"; alias: "elm/scroller/base/map_bubble"; alias: "elm/genscroller/base/no_bar"; @@ -611,3 +666,37 @@ group { name: "elm/scroller/base/no_bar"; } } } + +group { name: "elm/genlist/base/no_bar"; + inherit: "elm/genlist/base/default"; + + parts { + part { name: "elm.dragable.vbar"; + description { state: "default" 0.0; + visible: 0; + } + } + part { name: "elm.dragable.hbar"; + description { state: "default" 0.0; + visible: 0; + } + } + } +} + +group { name: "elm/gengrid/base/no_bar"; + inherit: "elm/gengrid/base/default"; + + parts { + part { name: "elm.dragable.vbar"; + description { state: "default" 0.0; + visible: 0; + } + } + part { name: "elm.dragable.hbar"; + description { state: "default" 0.0; + visible: 0; + } + } + } +} diff --git a/ElmSharp/theme/tv/widgets/slider.edc b/ElmSharp/theme/tv/widgets/slider.edc index bedd884..5045309 100644 --- a/ElmSharp/theme/tv/widgets/slider.edc +++ b/ElmSharp/theme/tv/widgets/slider.edc @@ -57,6 +57,7 @@ group { name: "elm/slider/horizontal/default"; to_x: "pad.level.right"; relative: 0 1; } + color_class: "slider/default/bg"; } } part { name: "pad.level.left"; type: SPACER; mouse_events: 0; diff --git a/ElmSharp/theme/tv/widgets/spinner.edc b/ElmSharp/theme/tv/widgets/spinner.edc index 72a897a..804488c 100644 --- a/ElmSharp/theme/tv/widgets/spinner.edc +++ b/ElmSharp/theme/tv/widgets/spinner.edc @@ -35,7 +35,7 @@ group { name: "elm/spinner/base/default"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 255 255 255 255; + color_class: "spinner/default/bg"; } } part { name: "access"; @@ -181,7 +181,7 @@ group { name: "elm/spinner/base/vertical"; scale: 1; description { state: "default" 0.0; min: 146 348; - color: 250 250 250 255; + color_class: "spinner/vertical/bg"; } } part { name: "access"; -- 2.7.4