From 69b6485e640eecef98b9e4fb65a050a4bb4ff464 Mon Sep 17 00:00:00 2001 From: Radek Kintop Date: Tue, 9 May 2017 16:28:36 +0200 Subject: [PATCH] Menu button style update - Value text size and color fixed - Shadow added Change-Id: Ic8fec3362d4e211671a02d0a36d1c6ec04e86078 Signed-off-by: Radek Kintop --- include/define.h | 1 - res/widget/button.edc | 36 ++++++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/include/define.h b/include/define.h index ceda7aa..399d36a 100644 --- a/include/define.h +++ b/include/define.h @@ -165,7 +165,6 @@ #define COLOR_TEXT_DISABLE 92 92 92 155 #define COLOR_TEXT_VALUE 89 89 89 255 -#define COLOR_TEXT_VALUE_ITEM 0 129 198 255 #define COLOR_TEXT_VALUE_FOCUS 0 129 198 255 #define COLOR_TEXT_VALUE_SELECTED 255 255 255 255 diff --git a/res/widget/button.edc b/res/widget/button.edc index f31036c..9c1708b 100644 --- a/res/widget/button.edc +++ b/res/widget/button.edc @@ -577,6 +577,26 @@ group { } } part { + name: "shadow"; + type: IMAGE; + scale: 0; + description { + state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; + rel1.relative: -0.121 -0.1675; + rel2.relative: 1.121 1.163; + color: 255 255 255 0; + align: 0.5 0.5; + image.normal: SHADOW_IMG; + } + description { + state, "focused" 0.0; + inherit, "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "bg"; type: IMAGE; scale: 0; @@ -593,7 +613,6 @@ group { inherit, "default" 0.0; rel1.relative: -0.05 -0.05; rel2.relative: 1.05 1.05; - color: 255 255 255 255; } } part { @@ -651,22 +670,18 @@ group { action, STATE_SET "focused" 0.0; target, "bg"; target, "elm.text"; + target, "shadow"; transition, TRANSITION_FOCUS; } program { name, "unfocused"; signal, SIG_UNFOCUSED; source, "elm"; - action, STATE_SET "image_change" 0.0; - target, "bg"; - transition, TRANSITION_FOCUS; - after: "unfocused_scale"; - } - program { - name, "unfocused_scale"; action, STATE_SET "default" 0.0; target, "bg"; target, "elm.text"; + target, "shadow"; + transition, TRANSITION_FOCUS; } program { name, "disabled"; @@ -684,7 +699,7 @@ group { styles { style { name, "style.subtext2"; - base, "font=BreezeSans:style=Light font_size=40 color=#5959FF wrap=word align=center"; + base, "font=BreezeSans:style=Light font_size=68 color=#0081C6 wrap=word align=center"; tag, "br" "\n"; } } @@ -720,8 +735,6 @@ group { relative, 0.0 0.5; } rel2.to, "bg.content"; - - color: COLOR_TEXT_VALUE_ITEM; text { align, 0.5 0.0; @@ -731,7 +744,6 @@ group { description { state, "focused" 0.0; inherit, "default" 0.0; - color, COLOR_TEXT_VALUE_FOCUS; } description { state, "disabled" 0.0; -- 2.7.4