From a4210afd9f2fa1b82dc5dc29c174e2fde787fd15 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Wed, 28 Dec 2011 20:20:56 +0900 Subject: [PATCH] popup - added dim clicked effect to avoid A patent. Change-Id: I4c84326651cafd123d9dca45b71d9a375cb2d0aa --- themes/inc/tizen-black-hd-inc.edc | 5 ++++- themes/inc/tizen-black-inc.edc | 5 ++++- themes/inc/tizen-hd-inc.edc | 5 ++++- themes/inc/tizen-inc.edc | 5 ++++- themes/widgets/popup.edc | 42 +++++++++++++++++++++++++++++++++++++-- 5 files changed, 56 insertions(+), 6 deletions(-) diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc index 5e9865b..abb9000 100644 --- a/themes/inc/tizen-black-hd-inc.edc +++ b/themes/inc/tizen-black-hd-inc.edc @@ -57,7 +57,10 @@ #define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC 249 249 249 255 #define POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC "#F9F9F9" -#define POPUP_DIM_BG_COLOR 0 0 0 125 +#define POPUP_DIM_BG_COLOR_INC 0 0 0 125 +#define POPUP_DIM_BG_CLICKED_COLOR_INC 0 0 0 175 +#define POPUP_DIM_BG_TRANS_COLOR_INC 0 0 0 0 +#define POPUP_DIM_BG_CLICKED_TRANS_COLOR_INC 0 0 0 50 #define POPUP_CUSTOMSTYLE_TITLE_BOTTOM_LINE_COLOR_INC 71 82 87 255 #define POPUP_CUSTOMSTYLE_TITLE_TEXT_COLOR_INC 249 249 249 255 diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc index ab78187..838ba60 100644 --- a/themes/inc/tizen-black-inc.edc +++ b/themes/inc/tizen-black-inc.edc @@ -54,7 +54,10 @@ #define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC 249 249 249 255 #define POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC "#F9F9F9" -#define POPUP_DIM_BG_COLOR 0 0 0 125 +#define POPUP_DIM_BG_COLOR_INC 0 0 0 125 +#define POPUP_DIM_BG_CLICKED_COLOR_INC 0 0 0 175 +#define POPUP_DIM_BG_TRANS_COLOR_INC 0 0 0 0 +#define POPUP_DIM_BG_CLICKED_TRANS_COLOR_INC 0 0 0 50 #define POPUP_CUSTOMSTYLE_TITLE_BOTTOM_LINE_COLOR_INC 71 82 87 255 #define POPUP_CUSTOMSTYLE_TITLE_TEXT_COLOR_INC 249 249 249 255 diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 9f58226..bce59f0 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -57,7 +57,10 @@ #define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC 255 255 255 255 #define POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC "#000000" -#define POPUP_DIM_BG_COLOR 61 59 56 204 +#define POPUP_DIM_BG_COLOR_INC 61 59 56 204 +#define POPUP_DIM_BG_CLICKED_COLOR_INC 61 59 56 250 +#define POPUP_DIM_BG_TRANS_COLOR_INC 0 0 0 0 +#define POPUP_DIM_BG_CLICKED_TRANS_COLOR_INC 0 0 0 50 #define POPUP_CUSTOMSTYLE_TITLE_BOTTOM_LINE_COLOR_INC 199 199 199 255 #define POPUP_CUSTOMSTYLE_TITLE_TEXT_COLOR_INC 0 0 0 255 diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc index c57e31a..33e2f4c 100644 --- a/themes/inc/tizen-inc.edc +++ b/themes/inc/tizen-inc.edc @@ -54,7 +54,10 @@ #define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC 255 255 255 255 #define POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC "#000000" -#define POPUP_DIM_BG_COLOR 61 59 56 204 +#define POPUP_DIM_BG_COLOR_INC 61 59 56 204 +#define POPUP_DIM_BG_CLICKED_COLOR_INC 61 59 56 250 +#define POPUP_DIM_BG_TRANS_COLOR_INC 0 0 0 0 +#define POPUP_DIM_BG_CLICKED_TRANS_COLOR_INC 0 0 0 50 #define POPUP_CUSTOMSTYLE_TITLE_BOTTOM_LINE_COLOR_INC 199 199 199 255 #define POPUP_CUSTOMSTYLE_TITLE_TEXT_COLOR_INC 0 0 0 255 diff --git a/themes/widgets/popup.edc b/themes/widgets/popup.edc index 5e1b6b9..5575d58 100644 --- a/themes/widgets/popup.edc +++ b/themes/widgets/popup.edc @@ -24,7 +24,10 @@ group { name: "elm/notify/block_events/popup"; mouse_events: 1; repeat_events: 0; description { state: "default" 0.0; - color: POPUP_DIM_BG_COLOR; + color: POPUP_DIM_BG_COLOR_INC; + } + description { state: "clicked" 0.0; + color: POPUP_DIM_BG_CLICKED_COLOR_INC; } } } @@ -34,6 +37,22 @@ group { name: "elm/notify/block_events/popup"; signal: "mouse,clicked,1"; source: "block_events"; action: SIGNAL_EMIT "elm,action,clicked" "elm"; + after: "deeper_block_color"; + } + program { + name: "deeper_block_color"; + signal: "elm,state,block_events,clicked"; + action: STATE_SET "clicked" 0.0; + target: "block_events"; + transition: LINEAR 0.2; + after: "default_block_color"; + } + program { + name: "default_block_color"; + signal: "elm,state,block_events,default"; + action: STATE_SET "default" 0.0; + target: "block_events"; + transition: LINEAR 0.2; } } } @@ -45,7 +64,10 @@ group { name: "elm/notify/block_events/transparent"; mouse_events: 1; repeat_events: 0; description { state: "default" 0.0; - color: 0 0 0 0; + color: POPUP_DIM_BG_TRANS_COLOR_INC; + } + description { state: "clicked" 0.0; + color: POPUP_DIM_BG_CLICKED_TRANS_COLOR_INC; } } } @@ -55,6 +77,22 @@ group { name: "elm/notify/block_events/transparent"; signal: "mouse,clicked,1"; source: "block_events"; action: SIGNAL_EMIT "elm,action,clicked" "elm"; + after: "deeper_block_color"; + } + program { + name: "deeper_block_color"; + signal: "elm,state,block_events,clicked"; + action: STATE_SET "clicked" 0.0; + target: "block_events"; + transition: LINEAR 0.2; + after: "default_block_color"; + } + program { + name: "default_block_color"; + signal: "elm,state,block_events,default"; + action: STATE_SET "default" 0.0; + target: "block_events"; + transition: LINEAR 0.2; } } } -- 2.7.4