From ce4c9b8bdf2b0f1334e7044dcf98a1b7b10b6048 Mon Sep 17 00:00:00 2001 From: sumanth Date: Tue, 9 Jul 2013 23:49:08 +0530 Subject: [PATCH] [Timepicker] UX1.1: popup spinner text color is changed in light theme and spinner up/down arrow parts implementation is corrected. Change-Id: I231342c875b5a2e332dc1bcd445bf34fd33794d4 --- themes/inc/tizen-dark-inc.edc | 8 +++ themes/inc/tizen-light-inc.edc | 10 ++- themes/widgets/datetime.edc | 141 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 153 insertions(+), 6 deletions(-) diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index ccfc7c8..7ccce8a 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -1133,6 +1133,14 @@ #define SPINNER_TEXT_HEIGHT_INC 100 #define SPINNER_ENTRY_TEXT_SIZE_INC 64 #define SPINNER_ENTRY_TEXT_COLOR_INC 250 250 250 255 +#define SPINNER_UP_DOWN_ARROW_DEFAULT_TOP_OFFSET_INC 0 2 +#define SPINNER_UP_DOWN_ARROW_DEFAULT_BOTTOM_OFFSET_INC -1 1 +#define SPINNER_UP_DOWN_ARROW_PRESSED_TOP_OFFSET_INC 0 -2 +#define SPINNER_UP_DOWN_ARROW_PRESSED_BOTTOM_OFFSET_INC -1 -3 +#define SPINNER_UP_DOWN_ARROW_SHADOW_DEFAULT_COLOR_INC 0 0 0 255 +#define SPINNER_UP_DOWN_ARROW_SHADOW_PRESSED_COLOR_INC 0 0 0 255 +#define SPINNER_UP_DOWN_ARROW_DEFAULT_COLOR_INC 250 250 250 255 +#define SPINNER_UP_DOWN_ARROW_PRESSED_COLOR_INC 250 250 250 255 #define ENTRY_DATETIME_POPUP_TEXT_SIZE_INC 64 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index e7af3fd..eed2ba4 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -1133,7 +1133,15 @@ #define SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC 54 54 #define SPINNER_TEXT_HEIGHT_INC 100 #define SPINNER_ENTRY_TEXT_SIZE_INC 64 -#define SPINNER_ENTRY_TEXT_COLOR_INC 250 250 250 255 +#define SPINNER_ENTRY_TEXT_COLOR_INC 0 0 0 255 +#define SPINNER_UP_DOWN_ARROW_DEFAULT_TOP_OFFSET_INC 0 2 +#define SPINNER_UP_DOWN_ARROW_DEFAULT_BOTTOM_OFFSET_INC -1 1 +#define SPINNER_UP_DOWN_ARROW_PRESSED_TOP_OFFSET_INC 0 0 +#define SPINNER_UP_DOWN_ARROW_PRESSED_BOTTOM_OFFSET_INC -1 -1 +#define SPINNER_UP_DOWN_ARROW_SHADOW_DEFAULT_COLOR_INC 250 250 250 255 +#define SPINNER_UP_DOWN_ARROW_SHADOW_PRESSED_COLOR_INC 250 250 250 0 +#define SPINNER_UP_DOWN_ARROW_DEFAULT_COLOR_INC 40 40 40 255 +#define SPINNER_UP_DOWN_ARROW_PRESSED_COLOR_INC 250 250 250 255 #define ENTRY_DATETIME_POPUP_TEXT_SIZE_INC 64 diff --git a/themes/widgets/datetime.edc b/themes/widgets/datetime.edc index 90666f2..185d159 100644 --- a/themes/widgets/datetime.edc +++ b/themes/widgets/datetime.edc @@ -1273,9 +1273,70 @@ group { name: "elm/spinner/base/default"; max: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC; image.normal: "00_picker_arrow_up.png"; } + } + part { name: "up.image.arrow.shadow.proxy"; + type: PROXY; + scale: 1; + clip_to: "up.image.arrow.shadow.clipper"; + description { state: "default" 0.0; + source: "up.image.arrow"; + proxy.source_clip: 0; + rel1 { + to: "up.image.arrow"; + offset: SPINNER_UP_DOWN_ARROW_DEFAULT_TOP_OFFSET_INC; + } + rel2 { + to: "up.image.arrow"; + offset: SPINNER_UP_DOWN_ARROW_DEFAULT_BOTTOM_OFFSET_INC; + } + } description { state: "pressed" 0.0; inherit: "default" 0.0; - image.normal: "00_picker_arrow_up.png"; + rel1 { + to: "up.image.arrow"; + offset: SPINNER_UP_DOWN_ARROW_PRESSED_TOP_OFFSET_INC; + } + rel2 { + to: "up.image.arrow"; + offset: SPINNER_UP_DOWN_ARROW_PRESSED_BOTTOM_OFFSET_INC; + } + } + } + part { name: "up.image.arrow.proxy"; + type: PROXY; + scale: 1; + clip_to: "up.image.arrow.clipper"; + description { state: "default" 0.0; + source: "up.image.arrow"; + proxy.source_clip: 0; + rel1.to: "up.image.arrow"; + rel2.to: "up.image.arrow"; + } + } + part { name: "up.image.arrow.shadow.clipper"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1.to: "up.image.arrow"; + rel2.to: "up.image.arrow"; + color: SPINNER_UP_DOWN_ARROW_SHADOW_DEFAULT_COLOR_INC; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: SPINNER_UP_DOWN_ARROW_SHADOW_PRESSED_COLOR_INC; + } + } + part { name: "up.image.arrow.clipper"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1.to: "up.image.arrow"; + rel2.to: "up.image.arrow"; + color: SPINNER_UP_DOWN_ARROW_DEFAULT_COLOR_INC; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: SPINNER_UP_DOWN_ARROW_PRESSED_COLOR_INC; } } part { name: "down.image"; @@ -1304,9 +1365,70 @@ group { name: "elm/spinner/base/default"; max: SPINNER_UP_DOWN_ARROW_IMAGE_SIZE_INC; image.normal: "00_picker_arrow_down.png"; } + } + part { name: "down.image.arrow.shadow.proxy"; + type: PROXY; + scale: 1; + clip_to: "down.image.arrow.shadow.clipper"; + description { state: "default" 0.0; + source: "down.image.arrow"; + proxy.source_clip: 0; + rel1 { + to: "down.image.arrow"; + offset: SPINNER_UP_DOWN_ARROW_DEFAULT_TOP_OFFSET_INC; + } + rel2 { + to: "down.image.arrow"; + offset: SPINNER_UP_DOWN_ARROW_DEFAULT_BOTTOM_OFFSET_INC; + } + } description { state: "pressed" 0.0; inherit: "default" 0.0; - image.normal: "00_picker_arrow_down.png"; + rel1 { + to: "down.image.arrow"; + offset: SPINNER_UP_DOWN_ARROW_PRESSED_TOP_OFFSET_INC; + } + rel2 { + to: "down.image.arrow"; + offset: SPINNER_UP_DOWN_ARROW_PRESSED_BOTTOM_OFFSET_INC; + } + } + } + part { name: "down.image.arrow.proxy"; + type: PROXY; + scale: 1; + clip_to: "down.image.arrow.clipper"; + description { state: "default" 0.0; + source: "down.image.arrow"; + proxy.source_clip: 0; + rel1.to: "down.image.arrow"; + rel2.to: "down.image.arrow"; + } + } + part { name: "down.image.arrow.shadow.clipper"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1.to: "down.image.arrow"; + rel2.to: "down.image.arrow"; + color: SPINNER_UP_DOWN_ARROW_SHADOW_DEFAULT_COLOR_INC; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: SPINNER_UP_DOWN_ARROW_SHADOW_PRESSED_COLOR_INC; + } + } + part { name: "down.image.arrow.clipper"; + type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1.to: "down.image.arrow"; + rel2.to: "down.image.arrow"; + color: SPINNER_UP_DOWN_ARROW_DEFAULT_COLOR_INC; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + color: SPINNER_UP_DOWN_ARROW_PRESSED_COLOR_INC; } } part { name: "elm.text"; @@ -1415,7 +1537,9 @@ group { name: "elm/spinner/base/default"; source: "down.btn"; action: STATE_SET "pressed" 0.0; target: "down.image"; - target: "down.image.arrow"; + target: "down.image.arrow.shadow.proxy"; + target: "down.image.arrow.shadow.clipper"; + target: "down.image.arrow.clipper"; after: "dec_start_signal_emit"; } program { name: "dec2"; @@ -1423,7 +1547,9 @@ group { name: "elm/spinner/base/default"; source: "down.btn"; action: STATE_SET "default" 0.0; target: "down.image"; - target: "down.image.arrow"; + target: "down.image.arrow.shadow.proxy"; + target: "down.image.arrow.shadow.clipper"; + target: "down.image.arrow.clipper"; after: "dec_stop_signal_emit"; } program { name: "inc"; @@ -1431,7 +1557,9 @@ group { name: "elm/spinner/base/default"; source: "up.btn"; action: STATE_SET "pressed" 0.0; target: "up.image"; - target: "up.image.arrow"; + target: "up.image.arrow.shadow.proxy"; + target: "up.image.arrow.shadow.clipper"; + target: "up.image.arrow.clipper"; after: "inc_start_signal_emit"; } program { name: "inc2"; @@ -1440,6 +1568,9 @@ group { name: "elm/spinner/base/default"; action: STATE_SET "default" 0.0; target: "up.image"; target: "up.image.arrow"; + target: "up.image.arrow.shadow.proxy"; + target: "up.image.arrow.shadow.clipper"; + target: "up.image.arrow.clipper"; after: "inc_stop_signal_emit"; } program { name: "disable"; -- 2.7.4