merge with master

[platform/core/uifw/efl-theme-tizen.git] / themes / widgets / slider.edc

diff --git a/themes/widgets/slider.edc b/themes/widgets/slider.edc
index fa97bc3..fe7fc32 100644 (file)
--- a/themes/widgets/slider.edc
+++ b/themes/widgets/slider.edc
@@ -19,8 +19,8 @@
 
    group { name: "elm/slider/horizontal/tap_to_drag";
       images {
-         image: "00_winset_list_progress_bg.png" COMP;
-         image: "00_winset_list_progress_bar.png" COMP;
+         image: "00_progress_bg.png" COMP;
+         image: "00_progress_bar.png" COMP;
       }
       script {
          public invert_on = 0;
@@ -60,26 +60,66 @@
                   rel2 { to: "bg";
                      offset: -5 -1;
                   }
-                  image.normal: "00_winset_list_progress_bg.png";
-                  image.border: 0 0 4 4;
+                  image.normal: "00_progress_bg.png";
+                  image.border: PROGRESS_BG_IMAGE_BORDER_INC;
                   image.border_scale: 1;
                }
             }
+            part {
+               name: "bar_image_left_padding";
+               type: RECT;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  visible: 0;
+                  min: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC;
+                  max: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC;
+                  fixed: 1 0;
+                  rel1.to: "base";
+                  rel2 {
+                     relative: 0.0  1.0;
+                     to: "base";
+                  }
+                  align: 0.0 0.5;
+               }
+            }
+            part {
+               name: "bar_image_right_padding";
+               type: RECT;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  visible: 0;
+                  min: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC;
+                  max: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC;
+                  fixed: 1 0;
+                  rel1 {
+                     relative: 1.0  0.0;
+                     to: "base";
+                  }
+                  rel2.to: "base";
+                  align: 1.0 0.5;
+               }
+            }
             part { name: "level";
                mouse_events: 0;
                scale: 1;
                clip_to: "clipper";
                description { state: "default" 0.0;
                   fixed: 1 1;
-                  rel1.to: "base";
+                  rel1 {
+                     to_x: "bar_image_left_padding";
+                     to_y: "base";
+                     relative: 1.0 0.0;
+                  }
                   rel2 {
                      to_y: "base";
                      to_x: "elm.dragable.slider";
                      offset: -5 -1;
                      relative: 0.5 1.0;
                   }
-                  image.normal: "00_winset_list_progress_bar.png";
-                  image.border: 0 0 4 4;
+                  image.normal: "00_progress_bar.png";
+                  image.border: PROGRESS_BAR_IMAGE_BORDER_INC;
                   image.border_scale: 1;
                }
                description { state: "inverted" 0.0;
@@ -88,7 +128,6 @@
                }
                description { state: "pressed" 0.0;
                   inherit: "default" 0.0;
-                  image.normal: "00_winset_list_progress_bar.png";
                }
             }
             part { name: "level2";
@@ -103,12 +142,15 @@
                      to_x: "elm.dragable.slider";
                      relative: 0.5 0.0;
                   }
-                  rel2.to: "base";
-                  rel2.offset: -2 -1;
-                     image.normal: "00_winset_list_progress_bg.png";
-                     image.border: 0 0 4 4;
-                      image.border_scale: 1;
+                  rel1 {
+                     to_x: "bar_image_right_padding";
+                     to_y: "base";
+                     relative: 0.0 1.0;
                   }
+                  image.normal: "00_progress_bg.png";
+                  image.border: PROGRESS_BG_IMAGE_BORDER_INC;
+                  image.border_scale: 1;
+               }
                description { state: "inverted" 0.0;
                   inherit: "default" 0.0;
                   visible: 1;
@@ -116,7 +158,6 @@
                description { state: "pressed" 0.0;
                   inherit: "default" 0.0;
                   visible: 1;
-                  image.normal: "00_winset_list_progress_bg.png";
                }
             }
             part { name: "bg";
@@ -2582,24 +2623,64 @@
                   rel1.to: "bg";
                   rel2.to: "bg";
                   image.normal: "00_progress_bg.png";
-                  image.border: 17 17 0 0;
+                  image.border: PROGRESS_BG_IMAGE_BORDER_INC;
                   image.border_scale: 1;
                }
             }
+            part {
+               name: "bar_image_left_padding";
+               type: RECT;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  visible: 0;
+                  min: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC;
+                  max: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC;
+                  fixed: 1 0;
+                  rel1.to: "base";
+                  rel2 {
+                     relative: 0.0  1.0;
+                     to: "base";
+                  }
+                  align: 0.0 0.5;
+               }
+            }
+            part {
+               name: "bar_image_right_padding";
+               type: RECT;
+               scale: 1;
+               description {
+                  state: "default" 0.0;
+                  visible: 0;
+                  min: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC;
+                  max: PROGRESS_BAR_IMAGE_PADDING_SIZE_INC;
+                  fixed: 1 0;
+                  rel1 {
+                     relative: 1.0  0.0;
+                     to: "base";
+                  }
+                  rel2.to: "base";
+                  align: 1.0 0.5;
+               }
+            }
             part { name: "level";
                mouse_events: 0;
                scale: 1;
                clip_to: "clipper";
                description { state: "default" 0.0;
                   fixed: 1 1;
-                  rel1.to: "base";
+                  rel1 {
+                     to_x: "bar_image_left_padding";
+                     to_y: "base";
+                     relative: 1.0 0.0;
+                  }
                   rel2 {
                      to_y: "base";
                      to_x: "elm.dragable.slider";
                      relative: 0.5 1.0;
                   }
                   image.normal: "00_progress_bar.png";
-                  image.border: 17 17 0 0;
+                  image.border: PROGRESS_BAR_IMAGE_BORDER_INC;
                   image.border_scale: 1;
                }
                description { state: "inverted" 0.0;
@@ -2608,7 +2689,6 @@
                }
                description { state: "pressed" 0.0;
                   inherit: "default" 0.0;
-                  image.normal: "00_progress_bar.png";
                }
             }
             part { name: "level2";
@@ -2623,9 +2703,13 @@
                      to_x: "elm.dragable.slider";
                      relative: 0.5 0.0;
                   }
-                  rel2.to: "base";
+                  rel2 {
+                     to_y: "base";
+                     to_x: "bar_image_left_padding";
+                     relative: 0.0 1.0;
+                  }
                   image.normal: "00_progress_bar.png";
-                  image.border: 0 0 4 4;
+                  image.border: PROGRESS_BAR_IMAGE_BORDER_INC;
                   image.border_scale: 1;
                }
                description { state: "inverted" 0.0;
@@ -2635,7 +2719,6 @@
                description { state: "pressed" 0.0;
                   inherit: "default" 0.0;
                   visible: 1;
-                  image.normal: "00_progress_bar.png";
                }
             }
             part { name: "bg";
@@ -3005,8 +3088,8 @@
 group { name: "elm/slider/vertical/default";
         alias: "elm/slider/vertical/disabled";
    images {
-      image: "00_winset_list_progress_bg.png" COMP;
-      image: "00_winset_list_progress_bar.png" COMP;
+      image: "00_progress_bg.png" COMP;
+      image: "00_progress_bar.png" COMP;
    }
    parts {
       part { name: "base";
@@ -3018,27 +3101,67 @@ group { name: "elm/slider/vertical/default";
              rel1.to: "bg";
              rel2.to: "bg";
              image {
-                normal: "00_winset_list_progress_bg.png";
-                border: 0 0 4 4;
+                normal: "00_progress_bg.png";
+                border: PROGRESS_BG_IMAGE_BORDER_INC;
                 border_scale: 1;
              }
           }
       }
+      part {
+         name: "bar_image_top_padding";
+         type: RECT;
+         scale: 1;
+         description {
+             state: "default" 0.0;
+             visible: 0;
+             min: PROGRESS_BAR_IMAGE_VERTICAL_PADDING_SIZE_INC;
+             max: PROGRESS_BAR_IMAGE_VERTICAL_PADDING_SIZE_INC;
+             fixed: 0 1;
+             rel1.to: "base";
+             rel2 {
+                relative: 1.0 0.0;
+                to: "base";
+             }
+             align: 0.5 0.0;
+         }
+      }
+      part {
+         name: "bar_image_bottom_padding";
+         type: RECT;
+         scale: 1;
+         description {
+             state: "default" 0.0;
+             visible: 0;
+             min: PROGRESS_BAR_IMAGE_VERTICAL_PADDING_SIZE_INC;
+             max: PROGRESS_BAR_IMAGE_VERTICAL_PADDING_SIZE_INC;
+             fixed: 0 1;
+             rel1 {
+                relative: 0.0 1.0;
+                to: "base";
+             }
+             rel2.to: "base";
+             align: 0.5 1.0;
+         }
+      }
       part { name: "level";
          mouse_events: 0;
          scale: 1;
          clip_to: "clipper";
          description { state: "default" 0.0;
              fixed: 1 1;
-             rel1.to: "base";
+             rel1 {
+                to_x: "base";
+                to_y: "bar_image_top_padding";
+                relative: 0.0 1.0;
+             }
              rel2 {
                 to_x: "base";
                 to_y: "elm.dragable.slider";
                 relative: 1.0 0.5;
              }
              image {
-                normal: "00_winset_list_progress_bar.png";
-                border: 0 0 4 4;
+                normal: "00_progress_bar.png";
+                border: PROGRESS_BAR_IMAGE_BORDER_INC;
                 border_scale: 1;
              }
          }
@@ -3059,10 +3182,14 @@ group { name: "elm/slider/vertical/default";
                 to_y: "elm.dragable.slider";
                 relative: 0.0 0.5;
              }
-             rel2.to: "base";
+             rel2 {
+                to_x: "base";
+                to_y: "bar_image_bottom_padding";
+                relative: 1.0 0.0;
+             }
              image {
-                normal: "00_winset_list_progress_bar.png";
-                border: 0 0 4 4;
+                normal: "00_progress_bar.png";
+                border: PROGRESS_BAR_IMAGE_BORDER_INC;
                 border_scale: 1;
              }
          }