efl_ui_*: fix regressions on legacy side

elm_progressbar_value_set with value bigger than max (or less than min) set to
max value instead of the bigger value. Following commit broke this behavior.

   5efb4b3 efl_ui_*: get range users onto the same semantics

Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D9277

diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 65441c6..5ad712c 100644 (file)
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -605,23 +605,24 @@ _progressbar_part_value_get(Efl_Ui_Progressbar_Data *sd, const char* part)
 EOLIAN static void
 _efl_ui_progressbar_efl_ui_range_display_range_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double val)
 {
-   if (val < sd->val_min)
-     {
-        ERR("Error, value is less than minimum");
-        return;
-     }
-
-   if (val > sd->val_max)
-     {
-        ERR("Error, value is greater than maximum");
-        return;
-     }
    if (EINA_DBL_EQ(sd->val, val)) return;
 
    if (elm_widget_is_legacy(obj))
      _progressbar_part_value_set(obj, sd, "elm.cur.progressbar", val);
    else
-     _progressbar_part_value_set(obj, sd, "efl.cur.progressbar", val);
+     {
+        if (val < sd->val_min)
+          {
+             ERR("Error, value is less than minimum");
+             return;
+          }
+        if (val > sd->val_max)
+          {
+             ERR("Error, value is greater than maximum");
+             return;
+          }
+        _progressbar_part_value_set(obj, sd, "efl.cur.progressbar", val);
+     }
 }
 
 EOLIAN static double

diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 0bbb576..c92a7ee 100644 (file)
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -770,16 +770,18 @@ _efl_ui_slider_efl_ui_range_display_range_limits_get(const Eo *obj EINA_UNUSED,
 EOLIAN static void
 _efl_ui_slider_efl_ui_range_display_range_value_set(Eo *obj, Efl_Ui_Slider_Data *sd, double val)
 {
-   if (val < sd->val_min)
+   if (!elm_widget_is_legacy(obj))
      {
-        ERR("Error, value is less than minimum");
-        return;
-     }
-
-   if (val > sd->val_max)
-     {
-        ERR("Error, value is greater than maximum");
-        return;
+        if (val < sd->val_min)
+          {
+             ERR("Error, value is less than minimum");
+             return;
+          }
+        if (val > sd->val_max)
+          {
+             ERR("Error, value is greater than maximum");
+             return;
+          }
      }
 
    if (EINA_DBL_EQ(val, sd->val)) return;