[Slider.edc] Slider new style is added for indicator popup.

Change-Id: I4e520b99a3d3d2704c23d826886489a1c58e4a92

Conflicts:

	themes/widgets/slider.edc

diff --git a/themes/images/tizen-hd/Controls/00_slider_popup_center.png b/themes/images/tizen-hd/Controls/00_slider_popup_center.png
new file mode 100644 (file)
index 0000000..d5dc403
Binary files /dev/null and b/themes/images/tizen-hd/Controls/00_slider_popup_center.png differ

diff --git a/themes/images/tizen-hd/Controls/00_slider_popup_left.png b/themes/images/tizen-hd/Controls/00_slider_popup_left.png
new file mode 100644 (file)
index 0000000..b6daf32
Binary files /dev/null and b/themes/images/tizen-hd/Controls/00_slider_popup_left.png differ

diff --git a/themes/images/tizen-hd/Controls/00_slider_popup_right.png b/themes/images/tizen-hd/Controls/00_slider_popup_right.png
new file mode 100644 (file)
index 0000000..5aaac50
Binary files /dev/null and b/themes/images/tizen-hd/Controls/00_slider_popup_right.png differ

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 0ee157c..8dd5198 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -1017,6 +1017,16 @@
 #define SLIDER_INDICATOR_WIDTH_INC 48
 #define SLIDER_INDICATOR_HEIGHT_INC 72
 
+#define SLIDER_INDICATOR_POPUP_TEXT_COLOR_INC 255 255 255 255
+#define SLIDER_INDICATOR_POPUP_TEXT_SIZE_INC 72
+#define SLIDER_INDICATOR_POPUP_HEIGHT_INC 108
+#define SLIDER_INDICATOR_POPUP_MIN_WIDTH_INC 90
+#define SLIDER_INDICATOR_POPUP_BG_IMAGE_WIDTH_INC 35
+#define SLIDER_INDICATOR_POPUP_BG_CENTER_IMAGE_SIZE_INC 20 108
+#define SLIDER_INDICATOR_POPUP_PADDING_MIN_SIZE_INC 12 0
+#define SLIDER_INDICATOR_POPUP_LEFT_BG_BORDER_INC 33 0 0 0
+#define SLIDER_INDICATOR_POPUP_RIGHT_BG_BORDER_INC 0 33 0 0
+
 #define TICKER_NOTI_DEFAULT_TEXT_COLOR_INC "#ffffff"
 #define TICKER_NOTI_DEFAULT_TEXT2_COLOR_INC "#ffffff"
 

diff --git a/themes/widgets/slider.edc b/themes/widgets/slider.edc
index bbde89b..d17bc55 100644 (file)
--- a/themes/widgets/slider.edc
+++ b/themes/widgets/slider.edc
@@ -702,6 +702,13 @@
       }
       script {
          public invert_on = 0;
+         public popup_show = 1;
+         public set_popup_show() {
+            set_int(popup_show, 1);
+         }
+         public set_popup_hide() {
+            set_int(popup_show, 0);
+         }
          public set_invert_on() {
             set_state(PART:"level", "inverted", 0.0);
             set_state(PART:"level2", "inverted", 0.0);
@@ -717,12 +724,16 @@
                set_state(PART:"level", "pressed", 0.0);
             else if(get_int(invert_on) == 1)
                set_state(PART:"level2", "pressed", 0.0);
+            if(get_int(popup_show) == 1)
+               emit("popup,show", "elm");
             }
          public thumb_up() {
             if(get_int(invert_on) == 0)
                set_state(PART:"level", "default", 0.0);
             else if(get_int(invert_on) == 1)
                set_state(PART:"level2", "inverted", 0.0);
+            if(get_int(popup_show) == 1)
+               emit("popup,hide", "elm");
             }
          }
          parts {
@@ -1018,6 +1029,22 @@
                   text.min: 1 1;
                }
             }
+            part { name: "elm.track.slider";
+               type: SWALLOW;
+               mouse_events: 0;
+               scale: 1;
+               description { state: "default" 0.0;
+                  min: 0 SLIDER_INDICATOR_POPUP_HEIGHT_INC;
+                  max: -1 SLIDER_INDICATOR_POPUP_HEIGHT_INC;
+                  align: 0.5 1.0;
+                  fixed: 0 1;
+                  rel1.to: "elm.dragable.slider";
+                  rel2 {
+                     relative: 1.0 0.0;
+                     to: "elm.dragable.slider";
+                  }
+               }
+            }
             part { name: "elm.dragable.slider";
                type: GROUP;
                source: "elm/slider/horizontal/indicator/default";
@@ -1138,6 +1165,20 @@
                thumb_up();
             }
          }
+         program { name: "popup_show";
+            signal: "elm,state,val,show";
+            source: "elm";
+            script {
+               set_popup_show();
+            }
+         }
+         program { name: "popup_hide";
+            signal: "elm,state,val,hide";
+            source: "elm";
+            script {
+               set_popup_hide();
+            }
+         }
          program { name: "slider_disable";
             signal: "elm,state,disabled";
             source: "elm";
@@ -1154,3 +1195,180 @@
          }
       }
    }
+
+   group { name: "elm/slider/horizontal/popup/default";
+      alias: "elm/slider/horizontal/popup/tap_to_drag";
+      images {
+         image: "00_slider_popup_center.png" COMP;
+         image: "00_slider_popup_left.png" COMP;
+         image: "00_slider_popup_right.png" COMP;
+      }
+      parts {
+         part { name: "bg";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: SLIDER_INDICATOR_POPUP_MIN_WIDTH_INC SLIDER_INDICATOR_POPUP_HEIGHT_INC;
+               max: -1 SLIDER_INDICATOR_POPUP_HEIGHT_INC;
+            }
+         }
+         part { name: "left.padding";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: SLIDER_INDICATOR_POPUP_PADDING_MIN_SIZE_INC;
+               max: SLIDER_INDICATOR_POPUP_PADDING_MIN_SIZE_INC;
+               rel1.to: "elm.indicator";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to: "elm.indicator";
+               }
+               align: 1.0 0.5;
+            }
+         }
+         part { name: "right.padding";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: SLIDER_INDICATOR_POPUP_PADDING_MIN_SIZE_INC;
+               max: SLIDER_INDICATOR_POPUP_PADDING_MIN_SIZE_INC;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to: "elm.indicator";
+               }
+               rel2.to: "elm.indicator";
+               align: 0.0 0.5;
+            }
+         }
+         part { name: "bg.left.image";
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1.to_x: "left.padding";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "bg.center.image";
+               }
+               align: 0.0 0.5;
+               min: SLIDER_INDICATOR_POPUP_BG_IMAGE_WIDTH_INC SLIDER_INDICATOR_POPUP_HEIGHT_INC;
+               max: -1 SLIDER_INDICATOR_POPUP_HEIGHT_INC;
+               image {
+                  normal: "00_slider_popup_left.png";
+                  border: SLIDER_INDICATOR_POPUP_LEFT_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "bg.right.image";
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "bg.center.image";
+               }
+               rel2.to_x: "right.padding";
+               align: 1.0 0.5;
+               min: SLIDER_INDICATOR_POPUP_BG_IMAGE_WIDTH_INC SLIDER_INDICATOR_POPUP_HEIGHT_INC;
+               max: -1 SLIDER_INDICATOR_POPUP_HEIGHT_INC;
+               image {
+                  normal: "00_slider_popup_right.png";
+                  border: SLIDER_INDICATOR_POPUP_RIGHT_BG_BORDER_INC;
+                  border_scale: 1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "bg.center.image";
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               fixed: 1 1;
+               min: SLIDER_INDICATOR_POPUP_BG_CENTER_IMAGE_SIZE_INC;
+               max: SLIDER_INDICATOR_POPUP_BG_CENTER_IMAGE_SIZE_INC;
+               image {
+                  normal: "00_slider_popup_center.png";
+                  border: 0 0 0 0;
+                  border_scale: 1;
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "elm.indicator";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               visible: 0;
+               min: SLIDER_INDICATOR_POPUP_MIN_WIDTH_INC SLIDER_INDICATOR_POPUP_HEIGHT_INC;
+               max: -1 SLIDER_INDICATOR_POPUP_HEIGHT_INC;
+               color: SLIDER_INDICATOR_POPUP_TEXT_COLOR_INC;
+               text {
+                  font: "Tizen:style=Bold";
+                  size: SLIDER_INDICATOR_POPUP_TEXT_SIZE_INC;
+                  align: 0.5 0.0;
+                  min: 1 1;
+                  text_class: "tizen";
+               }
+            }
+            description { state: "visible" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+      }
+      programs {
+         program { name: "popup,val,show";
+            signal: "elm,state,val,show";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "elm.indicator";
+            target: "bg.left.image";
+            target: "bg.right.image";
+            target: "bg.center.image";
+         }
+         program { name: "popup,val,hide";
+            signal: "elm,state,val,hide";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "elm.indicator";
+            target: "bg.left.image";
+            target: "bg.right.image";
+            target: "bg.center.image";
+         }
+         program { name: "popup,show";
+            signal: "popup,show";
+            source: "elm";
+            action:  STATE_SET "visible" 0.0;
+            target: "elm.indicator";
+            target: "bg.left.image";
+            target: "bg.right.image";
+            target: "bg.center.image";
+         }
+         program { name: "popup,hide";
+            signal: "popup,hide";
+            source: "elm";
+            action:  STATE_SET "default" 0.0;
+            target: "elm.indicator";
+            target: "bg.left.image";
+            target: "bg.right.image";
+            target: "bg.center.image";
+            after: "popup,hide,done";
+         }
+         program { name: "popup,hide,done";
+            action: SIGNAL_EMIT "popup,hide,done" "elm";
+         }
+      }
+   }