From: Youngbok Shin Date: Tue, 18 Jun 2013 05:14:48 +0000 (+0900) Subject: [button] Remove editfiled rename button style according to dark theme GUI X-Git-Tag: submit/tizen/20131004.114939~145 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52fe18b06bd523dd175d947d183c07f48c58b231;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git [button] Remove editfiled rename button style according to dark theme GUI Change-Id: Iddf32d869576c38c089449e4976add1baa3d3706 --- diff --git a/themes/images/HD/dark/Content_views/00_edit_field_rename.png b/themes/images/HD/dark/Content_views/00_edit_field_rename.png deleted file mode 100644 index e31e5bc..0000000 Binary files a/themes/images/HD/dark/Content_views/00_edit_field_rename.png and /dev/null differ diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 13a95a6..ed72ebb 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -612,13 +612,6 @@ #define BUTTON_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC 93 97 118 255 #define BUTTON_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 93 97 118 128 -#define BUTTON_EDITFIELD_RENAME_BUTTON_MIN_MAX_INC 54 54 -#define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DEFAULT_COLOR_INC 72 93 147 255 -#define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_PRESSED_COLOR_INC 250 250 250 255 -#define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DISABLED_COLOR_INC 72 93 147 128 - -#define BUTTON_SEARCH_RENAME_BUTTON_MIN_MAX_INC 45 45 - #define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 54 54 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 72 93 147 255 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 250 250 250 255 diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc index ff9f1bd..ce4bf31 100755 --- a/themes/inc/tizen-light-inc.edc +++ b/themes/inc/tizen-light-inc.edc @@ -641,13 +641,6 @@ #define BUTTON_SEARCH_ICON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255 #define BUTTON_SEARCH_ICON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76 -#define BUTTON_EDITFIELD_RENAME_BUTTON_MIN_MAX_INC 54 54 -#define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255 -#define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_PRESSED_COLOR_INC 59 115 182 255 -#define BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DISABLED_COLOR_INC 128 128 128 76 - -#define BUTTON_SEARCH_RENAME_BUTTON_MIN_MAX_INC 45 45 - #define BUTTON_EDITFIELD_CLEAR_BUTTON_MIN_MAX_INC 54 54 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_DEFAULT_COLOR_INC 128 128 128 255 #define BUTTON_EDITFIELD_CLEAR_BUTTON_CLIPPER_PRESSED_COLOR_INC 59 115 182 255 diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc index 89b5f9c..e7a4da9 100644 --- a/themes/widgets/button.edc +++ b/themes/widgets/button.edc @@ -7760,132 +7760,6 @@ group { name: "elm/button/base/bubble_circle/sent"; } ////////////////////////////////////////////////////////////////////////////////////// - group { name: "elm/button/base/editfield_rename"; - images { - image: "00_edit_field_rename.png" COMP; - } - parts { - part { name: "button_image"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - visible: 0; - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - } - description { state: "focused" 0.0; - inherit: "default" 0.0; - } - } - part { name: "rename_button"; - scale: 1; - mouse_events: 0; - clip_to: "rename_button.clipper"; - description { state: "default" 0.0; - min: BUTTON_EDITFIELD_RENAME_BUTTON_MIN_MAX_INC; - max: BUTTON_EDITFIELD_RENAME_BUTTON_MIN_MAX_INC; - fixed: 1 1; - align: 0.5 0.5; - image.normal: "00_edit_field_rename.png"; - } - } - part { name: "rename_button.clipper"; - type: RECT; - description { state: "default" 0.0; - color: BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DEFAULT_COLOR_INC; - } - description { state: "clicked" 0.0; - color: BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_PRESSED_COLOR_INC; - } - description { state: "disabled" 0.0; - color: BUTTON_EDITFIELD_RENAME_BUTTON_CLIPPER_DISABLED_COLOR_INC; - } - } - part { name: "over2"; - type: RECT; - ignore_flags: ON_HOLD; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - part { name: "over3"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - part { name: "disabler"; - type: RECT; - description { state: "default" 0.0; - color: 0 0 0 0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - } - programs { - program { name: "button_click"; - signal: "mouse,down,1"; - source: "over2"; - action: SIGNAL_EMIT "elm,action,press" ""; - after: "button_click_anim"; - } - program { name: "button_click_anim"; - action: STATE_SET "clicked" 0.0; - target: "button_image"; - target: "rename_button.clipper"; - } - program { name: "button_double_click"; - signal: "mouse,down,1,double"; - source: "over1"; - after: "button_click_anim"; - } - program { name: "button_unclick"; - signal: "mouse,up,1"; - source: "over3"; - action: SIGNAL_EMIT "elm,action,unpress" ""; - after: "button_unclick_anim"; - } - program { name: "button_unclick_anim"; - action: STATE_SET "default" 0.0; - target: "button_image"; - target: "rename_button.clipper"; - } - program { name: "touch_snd"; - signal: "mouse,clicked,1"; - source: "over2"; - action: PLAY_SAMPLE "touch_sound" 1.0; - after: "button_unclick3"; - } - program { name: "button_unclick3"; - action: SIGNAL_EMIT "elm,action,click" ""; - } - program { name: "disable"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "button_image"; - target: "disabler"; - target: "rename_button.clipper"; - } - program { name: "enable"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "button_image"; - target: "disabler"; - target: "rename_button.clipper"; - } - } - } group { name: "elm/button/base/editfield_clear"; images { image: "00_edit_field_clear.png" COMP; @@ -8189,23 +8063,6 @@ BUTTON_DEFAULT_FOCUS_STYLES("focus_bottom", "00_list_group_bg_bottom_focus.png") } } } - group { name: "elm/button/base/search_rename"; - inherit: "elm/button/base/editfield_rename"; - parts { - part { name: "rename_button"; - scale: 1; - mouse_events: 0; - clip_to: "rename_button.clipper"; - description { state: "default" 0.0; - min: BUTTON_SEARCH_RENAME_BUTTON_MIN_MAX_INC; - max: BUTTON_SEARCH_RENAME_BUTTON_MIN_MAX_INC; - fixed: 1 1; - align: 0.5 0.5; - image.normal: "00_edit_field_rename.png"; - } - } - } - } group { name: "elm/button/base/search_clear"; inherit: "elm/button/base/editfield_clear";