cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=627ae1ef46668b41bc495cf65ba381dc4c65f88f
commit 627ae1ef46668b41bc495cf65ba381dc4c65f88f Author: taehyub <[email protected]> Date: Mon Jan 4 14:49:11 2016 -0800 popup: apply popup color class Summary: Apply popup color class - popup bg - popup title bg - popup title text - popup text Test Plan: 1. change popup color class in colorclass.edc 2. run elementary test 3. check the color of popup Reviewers: Hermet, kimcinoo, woohyun, raster Differential Revision: https://phab.enlightenment.org/D3489 Signed-off-by: Cedric BAIL <[email protected]> --- data/themes/colorclasses.edc | 16 ++++++++++++++++ data/themes/edc/elm/popup.edc | 9 +++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc index 4fca536..98e8c91 100644 --- a/data/themes/colorclasses.edc +++ b/data/themes/colorclasses.edc @@ -300,6 +300,22 @@ color_classes { color: FN_COL_HIGHLIGHT; desc: "Text of an active hoverselector item"; } + color_class { name: "popup_bg"; + color: 0 0 0 0; + desc: "Color of popup background"; + } + color_class { name: "popup_title_bg"; + color: 0 0 0 0; + desc: "Color of popup title background"; + } + color_class { name: "popup_title_text"; + color: 255 255 255 255; + desc: "Text color of popup title text"; + } + color_class { name: "popup_text"; + color: 255 255 255 255; + desc: "Text color of popup text"; + } // modules color_class { name: "module_label"; diff --git a/data/themes/edc/elm/popup.edc b/data/themes/edc/elm/popup.edc index e499999..5b8cb05 100644 --- a/data/themes/edc/elm/popup.edc +++ b/data/themes/edc/elm/popup.edc @@ -139,7 +139,7 @@ group { name: "elm/label/base/popup/default"; alias: "elm/label/base/popup/transparent"; styles { style { name: "popup_desc_style"; - base: "font="FN" font_size=10 text_class=label align=center color=#fff style=shadow,bottom shadow_color=#00000080 wrap=mixed"; + base: "font="FN" font_size=10 text_class=label align=center color=#fff color_class=popup_text style=shadow,bottom shadow_color=#00000080 wrap=mixed"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" text_class=label_light"; tag: "b" "+ font="FNBD" text_class=label_light"; @@ -175,7 +175,7 @@ group { name: "elm/popup/base/default"; alias: "elm/popup/base/transparent"; styles { style { name: "popup_title_style"; - base: "font="FNBD" font_size=10 text_class=label align=center color=#fff style=shadow,bottom shadow_color=#00000080 wrap=mixed"; + base: "font="FNBD" font_size=10 text_class=label align=center color=#fff color_class=popup_title_text style=shadow,bottom shadow_color=#00000080 wrap=mixed"; tag: "br" "\n"; tag: "hilight" "+ font="FNBD" text_class=label_light"; tag: "b" "+ font="FNBD" text_class=label_light"; @@ -184,10 +184,11 @@ group { name: "elm/popup/base/default"; } } parts { - part { name: "base"; type: SPACER; + part { name: "base"; type: RECT; scale: 1; description { state: "default" 0.0; min: 240 0; + color_class: "popup_bg"; } } part { name: "elm.bg.title"; type: RECT; @@ -195,7 +196,7 @@ group { name: "elm/popup/base/default"; fixed: 1 1; rel1.to: "elm.text.title"; rel2.to: "elm.text.title"; - visible: 0; + color_class: "popup_title_bg"; } } part { name: "elm.text.title"; type: TEXTBLOCK; --
