slider: remove range APIs

move this api into range intf and rename it
to interval

ref T5361

diff --git a/src/bin/elementary/test_slider.c b/src/bin/elementary/test_slider.c
index 9956a9b..17c0289 100644 (file)
--- a/src/bin/elementary/test_slider.c
+++ b/src/bin/elementary/test_slider.c
@@ -63,7 +63,7 @@ _change_range_print_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_inf
 {
    double from, to;
 
-   elm_slider_range_get(obj, &from, &to);
+   efl_ui_range_interval_get(obj, &from, &to);
 
    printf("range values:- from: %f, to: %f\n", from, to);
 }
@@ -332,8 +332,8 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
    evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
    elm_object_disabled_set(sl, EINA_TRUE);
-   elm_slider_range_enabled_set(sl, EINA_TRUE);
-   elm_slider_range_set(sl, 20, 100);
+   efl_ui_range_interval_enabled_set(sl, EINA_TRUE);
+   efl_ui_range_interval_set(sl, 20, 100);
    elm_box_pack_end(bx3, sl);
    evas_object_show(sl);
 
@@ -345,8 +345,8 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    elm_slider_unit_format_set(sl, "%1.5f units");
    elm_slider_indicator_format_set(sl, "%1.5f");
    elm_slider_span_size_set(sl, 160);
-   elm_slider_range_enabled_set(sl, EINA_TRUE);
-   elm_slider_range_set(sl, 0.4, 0.9);
+   efl_ui_range_interval_enabled_set(sl, EINA_TRUE);
+   efl_ui_range_interval_set(sl, 0.4, 0.9);
    elm_box_pack_end(bx3, sl);
    evas_object_show(sl);
 
@@ -360,7 +360,7 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    elm_slider_step_set(sl, step);
    evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
    evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
-   elm_slider_range_enabled_set(sl, EINA_TRUE);
+   efl_ui_range_interval_enabled_set(sl, EINA_TRUE);
    elm_box_pack_end(bx3, sl);
    evas_object_show(sl);
 
@@ -375,7 +375,7 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    elm_slider_indicator_show_on_focus_set(sl, EINA_TRUE);
    evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
    evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
-   elm_slider_range_enabled_set(sl, EINA_TRUE);
+   efl_ui_range_interval_enabled_set(sl, EINA_TRUE);
    elm_box_pack_end(bx3, sl);
    evas_object_show(sl);
 
@@ -393,7 +393,7 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    elm_slider_span_size_set(sl, 120);
    evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
    evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
-   elm_slider_range_enabled_set(sl, EINA_TRUE);
+   efl_ui_range_interval_enabled_set(sl, EINA_TRUE);
    elm_box_pack_end(bx3, sl);
    evas_object_show(sl);
 
@@ -412,7 +412,7 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    elm_slider_inverted_set(sl, EINA_TRUE);
    evas_object_size_hint_align_set(sl, 0.5, 0.5);
    evas_object_size_hint_weight_set(sl, 0.0, 0.0);
-   elm_slider_range_enabled_set(sl, EINA_TRUE);
+   efl_ui_range_interval_enabled_set(sl, EINA_TRUE);
    elm_box_pack_end(bx3, sl);
    evas_object_show(sl);
 
@@ -431,7 +431,7 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    elm_object_disabled_set(sl, EINA_TRUE);
    evas_object_size_hint_align_set(sl, 0.5, 0.5);
    evas_object_size_hint_weight_set(sl, 0.0, 0.0);
-   elm_slider_range_enabled_set(sl, EINA_TRUE);
+   efl_ui_range_interval_enabled_set(sl, EINA_TRUE);
    elm_slider_inverted_set(sl, EINA_TRUE);
    elm_box_pack_end(bx3, sl);
    evas_object_show(sl);
@@ -446,8 +446,8 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    elm_slider_indicator_format_set(sl, "%3.0f");
    elm_slider_min_max_set(sl, 50, 150);
    elm_object_scale_set(sl, 2.0);
-   elm_slider_range_enabled_set(sl, EINA_TRUE);
-   elm_slider_range_set(sl, 100, 145);
+   efl_ui_range_interval_enabled_set(sl, EINA_TRUE);
+   efl_ui_range_interval_set(sl, 100, 145);
    elm_box_pack_end(bx3, sl);
    evas_object_show(sl);
 
@@ -460,8 +460,8 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    evas_object_show(bx4);
 
    sl = elm_slider_add(bx4);
-   elm_slider_range_enabled_set(sl, EINA_TRUE);
-   elm_slider_range_set(sl, 0.2, 0.9);
+   efl_ui_range_interval_enabled_set(sl, EINA_TRUE);
+   efl_ui_range_interval_set(sl, 0.2, 0.9);
    elm_slider_horizontal_set(sl, EINA_FALSE);
    elm_object_text_set(sl, "Vertical");
    elm_slider_unit_format_set(sl, "%1.1f units");
@@ -490,11 +490,11 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    elm_slider_indicator_format_set(sl, "%1.1f");
    elm_object_scale_set(sl, 1.0);
    elm_slider_horizontal_set(sl, EINA_FALSE);
-   elm_slider_range_enabled_set(sl, EINA_TRUE);
+   efl_ui_range_interval_enabled_set(sl, EINA_TRUE);
    elm_box_pack_end(bx4, sl);
    evas_object_show(sl);
    elm_slider_min_max_set(sl, 50, 150);
-   elm_slider_range_set(sl, 100, 130);
+   efl_ui_range_interval_set(sl, 100, 130);
 
    ic = elm_icon_add(bx4);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
@@ -514,8 +514,8 @@ test_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
    elm_object_scale_set(sl, 1.0);
    elm_slider_horizontal_set(sl, EINA_FALSE);
    elm_object_disabled_set(sl, EINA_TRUE);
-   elm_slider_range_enabled_set(sl, EINA_TRUE);
-   elm_slider_range_set(sl, 0.2, 0.9);
+   efl_ui_range_interval_enabled_set(sl, EINA_TRUE);
+   efl_ui_range_interval_set(sl, 0.2, 0.9);
    elm_box_pack_end(bx4, sl);
    evas_object_show(sl);
 

diff --git a/src/lib/efl/interfaces/efl_ui_range.eo b/src/lib/efl/interfaces/efl_ui_range.eo
index b9eb9d5..42731ac 100644 (file)
--- a/src/lib/efl/interfaces/efl_ui_range.eo
+++ b/src/lib/efl/interfaces/efl_ui_range.eo
@@ -88,5 +88,24 @@ interface Efl.Ui.Range
             units: string @nullable; [[The format string for $obj's units label]]
          }
       }
+    @property range_interval_enabled {
+         [[ This enables two indicators in given range widget.
+
+           @since 1.18
+         ]]
+         values {
+            enable: bool; [[$true if two indicators are enabled, $false otherwise]]
+         }
+      }
+      @property range_interval {
+         [[ Sets up a start and end range point for given range widget.
+
+           @since 1.18
+         ]]
+         values {
+            from: double; [[Interval minimum value]]
+            to: double; [[Interval maximum value]]
+         }
+      }
    }
 }

diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index d708f30..6fe851a 100644 (file)
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -254,7 +254,7 @@ _units_set(Evas_Object *obj)
           {
              double v1, v2;
 
-             elm_slider_range_get(obj, &v1, &v2);
+             efl_ui_range_interval_get(obj, &v1, &v2);
              snprintf(buf, sizeof(buf), sd->units, v2 - v1);
           }
 
@@ -1227,13 +1227,13 @@ _efl_ui_slider_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider
 }
 
 EOLIAN static Eina_Bool
-_efl_ui_slider_range_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd)
+_efl_ui_slider_efl_ui_range_range_interval_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd)
 {
    return pd->range_enable;
 }
 
 EOLIAN static void
-_efl_ui_slider_range_enabled_set(Eo *obj, Efl_Ui_Slider_Data *sd, Eina_Bool enable)
+_efl_ui_slider_efl_ui_range_range_interval_enabled_set(Eo *obj, Efl_Ui_Slider_Data *sd, Eina_Bool enable)
 {
    if (sd->range_enable == enable) return;
 
@@ -1254,14 +1254,14 @@ _efl_ui_slider_range_enabled_set(Eo *obj, Efl_Ui_Slider_Data *sd, Eina_Bool enab
 }
 
 EOLIAN static void
-_efl_ui_slider_range_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd, double *from, double *to)
+_efl_ui_slider_efl_ui_range_range_interval_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd, double *from, double *to)
 {
    if (from) *from = fmin(pd->range_from, pd->range_to);
    if (to) *to = fmax(pd->range_from, pd->range_to);
 }
 
 EOLIAN static void
-_efl_ui_slider_range_set(Eo *obj, Efl_Ui_Slider_Data *pd, double from, double to)
+_efl_ui_slider_efl_ui_range_range_interval_set(Eo *obj, Efl_Ui_Slider_Data *pd, double from, double to)
 {
    pd->range_from = from;
    //TODO: remove val later

diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 1e6d2d0..4d9154f 100644 (file)
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -111,25 +111,6 @@ class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Range,
             free_func: slider_freefunc_type @nullable; [[The freeing function for the format string.]]
          }
       }
-      @property range_enabled {
-         [[ This enables two indicators in slider.
-
-           @since 1.18
-         ]]
-         values {
-            enable: bool; [[$true if two indicators are enabled, $false otherwise]]
-         }
-      }
-      @property range {
-         [[ Sets up a start and end range point for the slider
-
-           @since 1.18
-         ]]
-         values {
-            from: double; [[Range minimum value]]
-            to: double; [[Range maximum value]]
-         }
-      }
    }
    implements {
       class.constructor;
@@ -148,6 +129,8 @@ class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Range,
       Efl.Ui.Range.range_value { get; set; }
       Efl.Ui.Range.unit_format { get; set; }
       Efl.Ui.Range.range_min_max {get; set; }
+      Efl.Ui.Range.range_interval_enabled { get; set; }
+      Efl.Ui.Range.range_interval { get; set; }
       Efl.Orientation.orientation { get; set; }
       Elm.Interface.Atspi.Value.value_and_text { get; set; }
       Elm.Interface.Atspi.Value.range { get; }