From 64c84b9b5e11a07556a85038c25e608c86cd6157 Mon Sep 17 00:00:00 2001 From: WooHyun Jung Date: Thu, 6 Sep 2012 14:36:28 +0900 Subject: [PATCH 1/1] [layout : searchbar style] change the alignment of X-mark for supporting Giant font Change-Id: Iea4cf9faa1e587636b940feb2623f4d1a00c712a --- themes/inc/tizen-hd-inc.edc | 2 ++ themes/widgets/layout.edc | 46 +++++++++++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 845f757..0c5df16 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -755,6 +755,8 @@ #define EDITFIELD_DEFAULT_ERASER_EVENT_MINH_INC 70 #define EDITFIELD_SEARCHBAR_ERASER_MINW_INC 38 #define EDITFIELD_SEARCHBAR_ERASER_MINH_INC 38 +#define EDITFIELD_SEARCHBAR_ERASER_EVENT_MINW_INC 38 +#define EDITFIELD_SEARCHBAR_ERASER_EVENT_MINH_INC 50 #define EDITFIELD_DEFAULT_MINH_INC 112 #define EDITFIELD_TITLE_MINH_INC 128 #define EDITFIELD_SEARCHBAR_MINH_INC 50 diff --git a/themes/widgets/layout.edc b/themes/widgets/layout.edc index 10fc6e8..2283058 100644 --- a/themes/widgets/layout.edc +++ b/themes/widgets/layout.edc @@ -752,6 +752,7 @@ group { name: "elm/layout/editfield/default"; part { name: "eraser"; type: RECT; + scale: 1; mouse_events: 1; description { state: "default" 0.0; @@ -1100,6 +1101,7 @@ group { name: "elm/layout/editfield/title"; part { name: "eraser"; type: RECT; + scale: 1; mouse_events: 1; description { state: "default" 0.0; @@ -1545,16 +1547,14 @@ group { name: "elm/layout/searchbar/default"; visible: 0; min: EDITFIELD_SEARCHBAR_ERASER_MINW_INC EDITFIELD_SEARCHBAR_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"; } } description { state: "elm.eraser.show" 0.0; @@ -1579,16 +1579,22 @@ group { name: "elm/layout/searchbar/default"; } part { name: "eraser"; type: RECT; + scale: 1; mouse_events: 1; description { state: "default" 0.0; visible: 0; + min: EDITFIELD_SEARCHBAR_ERASER_EVENT_MINW_INC EDITFIELD_SEARCHBAR_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"; } - rel2.to: "search_textfield"; } description { state: "elm.eraser.show" 0.0; inherit: "default" 0.0; @@ -2191,16 +2197,14 @@ group { name: "elm/layout/searchbar/cancel_button"; visible: 0; min: EDITFIELD_SEARCHBAR_ERASER_MINW_INC EDITFIELD_SEARCHBAR_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"; } } description { state: "elm.eraser.show" 0.0; @@ -2225,16 +2229,22 @@ group { name: "elm/layout/searchbar/cancel_button"; } part { name: "eraser"; type: RECT; + scale: 1; mouse_events: 1; description { state: "default" 0.0; visible: 0; + min: EDITFIELD_SEARCHBAR_ERASER_EVENT_MINW_INC EDITFIELD_SEARCHBAR_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"; } - rel2.to: "search_textfield"; } description { state: "elm.eraser.show" 0.0; inherit: "default" 0.0; -- 2.7.4