[Slider.edc] Fix for PLM issue P130425-7408: Slider indicator image can not be moved...

Change-Id: I932a2da5a5f61e9a57045af42ee9e6ba393252f0

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 853aa2b..6441f66 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -1015,8 +1015,10 @@
 #define SLIDER_BASE_MIN_WIDTH_INC 375
 #define SLIDER_SWALLOW_BAR_MIN_WIDTH_INC  72
 #define SLIDER_SWALLOW_BAR_HEIGHT_INC  74
+#define SLIDER_INDICATOR_IMAGE_BORDER_INC  32 32 32 32
+#define SLIDER_INDICATOR_IMAGE_PADDING_SIZE_INC  12 0
 #define SLIDER_INDICATOR_MAX_WIDTH_INC 90
-#define SLIDER_INDICATOR_WIDTH_INC 72
+#define SLIDER_INDICATOR_WIDTH_INC 48
 #define SLIDER_INDICATOR_HEIGHT_INC 72
 #define SLIDER_EBOOK_HEIGHT_INC  23
 #define SLIDER_EBOOK_UNITS_TEXT_COLOR_INC   164 160 149 255

diff --git a/themes/widgets/slider.edc b/themes/widgets/slider.edc
index fe7fc32..965e3fa 100644 (file)
--- a/themes/widgets/slider.edc
+++ b/themes/widgets/slider.edc
@@ -527,24 +527,58 @@
                visible: 0;
             }
          }
-         part { name: "button0";
+         part { name: "image_left_padding";
+            type: RECT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               visible: 0;
                fixed: 1 1;
-               min: SLIDER_INDICATOR_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC;
-               max: SLIDER_INDICATOR_MAX_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC;
+               min: SLIDER_INDICATOR_IMAGE_PADDING_SIZE_INC;
+               max: SLIDER_INDICATOR_IMAGE_PADDING_SIZE_INC;
                rel1 {
-                  to: "elm.indicator";
-                  offset: -2 -2;
+                  to_x: "elm.indicator";
+                  relative: -1.0 0.0;
                }
                rel2 {
-                  to: "elm.indicator";
-                  offset: 2 2;
+                  to_x: "elm.indicator";
+                  relative: 0.0 1.0;
                }
+               align: 1.0 0.5;
+            }
+         }
+         part { name: "image_right_padding";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               fixed: 1 1;
+               min: SLIDER_INDICATOR_IMAGE_PADDING_SIZE_INC;
+               max: SLIDER_INDICATOR_IMAGE_PADDING_SIZE_INC;
+               rel1 {
+                  to_x: "elm.indicator";
+                  relative: 1.0 0.0;
+               }
+               rel2 {
+                  to_x: "elm.indicator";
+                  relative: 2.0 1.0;
+               }
+               align: 0.0 0.5;
+            }
+         }
+         part { name: "button0";
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               min: SLIDER_INDICATOR_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC;
+               max: SLIDER_INDICATOR_MAX_WIDTH_INC SLIDER_INDICATOR_HEIGHT_INC;
+               rel1.to: "image_left_padding";
+               rel2.to: "image_right_padding";
                image {
                   normal: "00_slider_handle.png";
-                  border: 3 3 3 3;
+                  border: SLIDER_INDICATOR_IMAGE_BORDER_INC;
                   border_scale: 1;
                }
             }