From: WooHyun Jung Date: Mon, 30 Apr 2012 02:22:27 +0000 (+0900) Subject: [editfield style] modified following GUI 1.5 X-Git-Tag: submit/2.0alpha-wayland/20121130.000903~159 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13f4ff010278a562aed79e13548517f35270593a;p=profile%2Fivi%2Fefl-theme-tizen.git [editfield style] modified following GUI 1.5 --- diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc index 75f8c4f..bdab740 100644 --- a/themes/inc/tizen-black-hd-inc.edc +++ b/themes/inc/tizen-black-hd-inc.edc @@ -808,6 +808,8 @@ #define EDITFIELD_GUIDE_TEXT_COLOR_INC 70 70 70 255 #define EDITFIELD_DEFAULT_ERASER_MINW_INC 48 #define EDITFIELD_DEFAULT_ERASER_MINH_INC 48 +#define EDITFIELD_DEFAULT_ERASER_EVENT_MINW_INC 48 +#define EDITFIELD_DEFAULT_ERASER_EVENT_MINH_INC 70 #define EDITFIELD_SEARCHBAR_ERASER_MINW_INC 38 #define EDITFIELD_SEARCHBAR_ERASER_MINH_INC 38 #define EDITFIELD_DEFAULT_MINH_INC 112 diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc index e1ff405..58be6c0 100644 --- a/themes/inc/tizen-black-inc.edc +++ b/themes/inc/tizen-black-inc.edc @@ -770,6 +770,8 @@ #define EDITFIELD_GUIDE_TEXT_COLOR_INC 70 70 70 255 #define EDITFIELD_DEFAULT_ERASER_MINW_INC 30 #define EDITFIELD_DEFAULT_ERASER_MINH_INC 30 +#define EDITFIELD_DEFAULT_ERASER_EVENT_MINW_INC 30 +#define EDITFIELD_DEFAULT_ERASER_EVENT_MINH_INC 50 #define EDITFIELD_SEARCHBAR_ERASER_MINW_INC 30 #define EDITFIELD_SEARCHBAR_ERASER_MINH_INC 30 #define EDITFIELD_DEFAULT_MINH_INC 80 diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index ab3a592..ef15e65 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -813,6 +813,8 @@ #define EDITFIELD_GUIDE_TEXT_COLOR_INC 189 189 189 255 #define EDITFIELD_DEFAULT_ERASER_MINW_INC 48 #define EDITFIELD_DEFAULT_ERASER_MINH_INC 48 +#define EDITFIELD_DEFAULT_ERASER_EVENT_MINW_INC 48 +#define EDITFIELD_DEFAULT_ERASER_EVENT_MINH_INC 70 #define EDITFIELD_SEARCHBAR_ERASER_MINW_INC 38 #define EDITFIELD_SEARCHBAR_ERASER_MINH_INC 38 #define EDITFIELD_DEFAULT_MINH_INC 112 diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc index 7273e32..b4fbeb6 100644 --- a/themes/inc/tizen-inc.edc +++ b/themes/inc/tizen-inc.edc @@ -783,6 +783,8 @@ #define EDITFIELD_GUIDE_TEXT_COLOR_INC 189 189 189 255 #define EDITFIELD_DEFAULT_ERASER_MINW_INC 30 #define EDITFIELD_DEFAULT_ERASER_MINH_INC 30 +#define EDITFIELD_DEFAULT_ERASER_EVENT_MINW_INC 30 +#define EDITFIELD_DEFAULT_ERASER_EVENT_MINH_INC 50 #define EDITFIELD_SEARCHBAR_ERASER_MINW_INC 30 #define EDITFIELD_SEARCHBAR_ERASER_MINH_INC 30 #define EDITFIELD_DEFAULT_MINH_INC 80 diff --git a/themes/widgets/layout.edc b/themes/widgets/layout.edc index 52010dd..ccd1a4e 100644 --- a/themes/widgets/layout.edc +++ b/themes/widgets/layout.edc @@ -663,20 +663,6 @@ group { name: "elm/layout/editfield/default"; } } part { - name: "bottom3"; - type: RECT; - scale: 1; - ignore_flags: ON_HOLD; - description { - state: "default" 0.0; - visible: 0; - min: 0 EDITFIELD_DEFAULT_BOTTOM3_SINGLE_INC; - fixed: 0 1; - rel1.relative: 0.0 1.0; - align: 0 1; - } - } - part { name: "elm.guidetext"; type: TEXT; scale: 1; @@ -730,16 +716,14 @@ group { name: "elm/layout/editfield/default"; visible: 0; min: EDITFIELD_DEFAULT_ERASER_MINW_INC EDITFIELD_DEFAULT_ERASER_MINH_INC; fixed: 1 1; - align: 1 1; + align: 1 0.5; rel1 { - relative: 0.0 0.0; + relative: 0.0 0.5; to_x : "right2"; - to_y : "bottom2"; } rel2 { - relative: 0.0 0.0; + relative: 0.0 0.5; to_x : "right2"; - to_y : "bottom2"; } image { normal: "00_EditField_clear.png"; @@ -760,11 +744,17 @@ group { name: "elm/layout/editfield/default"; description { state: "default" 0.0; visible: 0; + min: EDITFIELD_DEFAULT_ERASER_EVENT_MINW_INC EDITFIELD_DEFAULT_ERASER_EVENT_MINH_INC; + fixed: 1 1; + align: 1 0.5; color: 0 0 0 0; rel1 { - relative: 0.0 0.0; - to_x : "eraser_image"; - to_y : "bottom3"; + relative: 0.0 0.5; + to_x : "right2"; + } + rel2 { + relative: 0.0 0.5; + to_x : "right2"; } } description { @@ -949,17 +939,17 @@ group { name: "elm/layout/editfield/title"; } } part { - name: "bottom3"; + name: "eraser_base"; type: RECT; scale: 1; ignore_flags: ON_HOLD; description { state: "default" 0.0; visible: 0; - min: 0 EDITFIELD_DEFAULT_BOTTOM3_MULTI_INC; - fixed: 0 1; - rel1.relative: 0.0 1.0; - align: 0 1; + rel1 { + relative: 0.0 1.0; + to_y: "top1"; + } } } part { @@ -1045,16 +1035,16 @@ group { name: "elm/layout/editfield/title"; visible: 0; min: EDITFIELD_DEFAULT_ERASER_MINW_INC EDITFIELD_DEFAULT_ERASER_MINH_INC; fixed: 1 1; - align: 1 1; + align: 1 0.5; rel1 { - relative: 0.0 0.0; + relative: 0.0 0.5; to_x : "right2"; - to_y : "bottom2"; + to_y : "eraser_base"; } rel2 { - relative: 0.0 0.0; + relative: 0.0 0.5; to_x : "right2"; - to_y : "bottom2"; + to_y : "eraser_base"; } image { normal: "00_EditField_clear.png"; @@ -1075,11 +1065,19 @@ group { name: "elm/layout/editfield/title"; description { state: "default" 0.0; visible: 0; + min: EDITFIELD_DEFAULT_ERASER_EVENT_MINW_INC EDITFIELD_DEFAULT_ERASER_EVENT_MINH_INC; + fixed: 1 1; + align: 1 0.5; color: 0 0 0 0; rel1 { - relative: 0.0 0.0; - to_x : "eraser_image"; - to_y : "bottom3"; + relative: 0.0 0.5; + to_x : "right2"; + to_y : "eraser_base"; + } + rel2 { + relative: 0.0 0.5; + to_x : "right2"; + to_y : "eraser_base"; } } description {