From: sumanth Date: Tue, 10 Apr 2012 13:15:05 +0000 (+0530) Subject: [slider.edc] Slider indicator bg is made autoexpanded as per the indicator text. X-Git-Tag: 2.0_alpha~159 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de022f73771981f1caf5fc7fa0f33fed5a682c6c;p=framework%2Fuifw%2Fefl-theme-tizen.git [slider.edc] Slider indicator bg is made autoexpanded as per the indicator text. Change-Id: I0087eebbc5b2e1bd45409bbd98eaea415a81def0 --- diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc index 855f324..75f8c4f 100644 --- a/themes/inc/tizen-black-hd-inc.edc +++ b/themes/inc/tizen-black-hd-inc.edc @@ -1049,6 +1049,7 @@ #define SLIDER_BASE_HEIGHT_INC 16 #define SLIDER_SWALLOW_BAR_MIN_WIDTH_INC 58 #define SLIDER_SWALLOW_BAR_HEIGHT_INC 58 +#define SLIDER_INDICATOR_MAX_WIDTH_INC 90 #define SLIDER_INDICATOR_WIDTH_INC 58 #define SLIDER_INDICATOR_HEIGHT_INC 58 #define SLIDER_EBOOK_HEIGHT_INC 23 diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc index f1d3998..e1ff405 100644 --- a/themes/inc/tizen-black-inc.edc +++ b/themes/inc/tizen-black-inc.edc @@ -1014,6 +1014,7 @@ #define SLIDER_BASE_HEIGHT_INC 10 #define SLIDER_SWALLOW_BAR_MIN_WIDTH_INC 36 #define SLIDER_SWALLOW_BAR_HEIGHT_INC 36 +#define SLIDER_INDICATOR_MAX_WIDTH_INC 60 #define SLIDER_INDICATOR_WIDTH_INC 36 #define SLIDER_INDICATOR_HEIGHT_INC 36 #define SLIDER_EBOOK_HEIGHT_INC 14 diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 345a503..ab3a592 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -1055,6 +1055,7 @@ #define SLIDER_BASE_HEIGHT_INC 16 #define SLIDER_SWALLOW_BAR_MIN_WIDTH_INC 58 #define SLIDER_SWALLOW_BAR_HEIGHT_INC 58 +#define SLIDER_INDICATOR_MAX_WIDTH_INC 90 #define SLIDER_INDICATOR_WIDTH_INC 58 #define SLIDER_INDICATOR_HEIGHT_INC 58 #define SLIDER_EBOOK_HEIGHT_INC 23 diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc index c347980..7273e32 100644 --- a/themes/inc/tizen-inc.edc +++ b/themes/inc/tizen-inc.edc @@ -1027,6 +1027,7 @@ #define SLIDER_BASE_HEIGHT_INC 10 #define SLIDER_SWALLOW_BAR_MIN_WIDTH_INC 36 #define SLIDER_SWALLOW_BAR_HEIGHT_INC 36 +#define SLIDER_INDICATOR_MAX_WIDTH_INC 60 #define SLIDER_INDICATOR_WIDTH_INC 36 #define SLIDER_INDICATOR_HEIGHT_INC 36 #define SLIDER_EBOOK_HEIGHT_INC 14 diff --git a/themes/widgets/slider.edc b/themes/widgets/slider.edc index b97c712..7f74b05 100644 --- a/themes/widgets/slider.edc +++ b/themes/widgets/slider.edc @@ -477,7 +477,15 @@ description { state: "default" 0.0; fixed: 1 1; min: SLIDER_INDICATOR_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC; - max: SLIDER_INDICATOR_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC; + max: SLIDER_INDICATOR_MAX_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC; + rel1 { + to: "elm.indicator"; + offset: -2 -2; + } + rel2 { + to: "elm.indicator"; + offset: 2 2; + } image { normal: "00_slider_handle.png"; border: 3 3 3 3; @@ -497,18 +505,6 @@ scale: 1; description { state: "default" 0.0; visible: 1; - fixed: 1 1; - align: 0.5 0.5; - rel1 { - to: "button0"; - relative: 0.0 0; - offset: 0 0; - } - rel2 { - to: "button0"; - relative: 1.0 1.0; - offset: -2 -2; - } color: SLIDER_INDICATOR_TEXT_COLOR_INC; text { font: "SLP:style=Medium";