[slider.edc] Slider's indicator popup is removed in drag state.

Change-Id: I2233f7063a4e921b1b1ec8cc62944718d9a39cf9

diff --git a/themes/groups/slider.edc b/themes/groups/slider.edc
index 69c0244..6fbd469 100644 (file)
--- a/themes/groups/slider.edc
+++ b/themes/groups/slider.edc
@@ -461,40 +461,8 @@
            alias: "elm/slider/vertical/indicator/disabled";
       images {
          image: "00_slider_handle.png" COMP;
-         image: "00_slider_handle_press.png" COMP;
          image: "00_slider_handle_dim.png" COMP;
-         image: "00_slider_popup_bg.png" COMP;
       }
-      script {
-         public value_hide = 0;
-         public set_value_show() {
-            set_int(value_hide, 0);
-            set_state(PART:"elm.indicator", "default", 0.0);
-         }
-         public set_value_hide() {
-            set_int(value_hide, 1);
-            set_state(PART:"elm.indicator", "hide", 0.0);
-         }
-         public thumb_down() {
-            if(get_int(value_hide) == 1) {
-               set_state(PART:"elm.indicator", "hide", 0.0);
-               set_state(PART:"button0", "drag_state", 0.0);
-               set_state(PART:"popup", "default", 0.0);
-            } else {
-               set_state(PART:"elm.indicator", "drag_state", 0.0);
-               set_state(PART:"button0", "drag_state", 0.0);
-               set_state(PART:"popup", "drag_state", 0.0);
-            }
-         }
-         public thumb_up() {
-            if(get_int(value_hide) == 1)
-               set_state(PART:"elm.indicator", "hide", 0.0);
-            else
-               set_state(PART:"elm.indicator", "default", 0.0);
-            set_state(PART:"button0", "default", 0.0);
-            set_state(PART:"popup", "default", 0.0);
-            }
-         }
       parts {
          part { name: "button_events";
             type: RECT;
@@ -520,12 +488,6 @@
                   border_scale: 1;
                }
             }
-            description { state: "drag_state" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "00_slider_handle_press.png";
-               }
-            }
             description { state: "disabled" 0.0;
                inherit: "default" 0.0;
                image {
@@ -533,30 +495,6 @@
                }
             }
          }
-         part { name: "popup";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  to: "button0";
-                  relative: -0.4 -1.8;
-               }
-               rel2 {
-                  to: "button0";
-                  relative: 1.5 0.1;
-               }
-               image {
-                  normal: "00_slider_popup_bg.png";
-                  border: 5 5 4 8;
-                  border_scale: 1;
-               }
-               visible: 0;
-            }
-            description { state: "drag_state" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
          part { name: "elm.indicator";
             type: TEXT;
             mouse_events: 0;
@@ -583,17 +521,6 @@
                   align: 0.5 0.5;
                }
             }
-            description { state: "drag_state" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: SLIDER_INDICATOR_TEXT_COLOR_INC;
-               text.size: 40;
-               rel1.to: "popup";
-               rel2 {
-                  to: "popup";
-                  offset: -2 -10;
-               }
-            }
             description { state: "hide" 0.0;
                inherit: "default" 0.0;
                visible: 0;
@@ -604,30 +531,14 @@
          program { name: "set_val_show";
             signal: "elm,state,val,show";
             source: "elm";
-            script {
-               set_value_show();
-            }
+            action:  STATE_SET "default" 0.0;
+            target: "elm.indicator";
          }
          program { name: "set_val_hide";
             signal: "elm,state,val,hide";
             source: "elm";
-            script {
-               set_value_hide();
-            }
-         }
-         program { name: "val_show";
-            signal: "mouse,down,*";
-            source: "button_events";
-            script {
-               thumb_down();
-            }
-         }
-         program { name: "val_hide";
-            signal: "mouse,up,*";
-            source: "button_events";
-            script {
-               thumb_up();
-            }
+            action:  STATE_SET "hide" 0.0;
+            target: "elm.indicator";
          }
          program { name: "slider_disable";
             signal: "elm,state,disabled";