From 41b3d535b9910a7146e681bee442e3bcbe5068e1 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Mon, 21 Jan 2019 16:22:32 +0100 Subject: [PATCH] efl: split efl_ui_range into display and interactive display contains properties that are used to manipulate the display. Range_step is a interactive property since it manipulates the way the user interacts with this widget. This resolves a few unimplemented APIs. ref T5719 Reviewed-by: Xavi Artigas Differential Revision: https://phab.enlightenment.org/D7715 --- src/Makefile_Efl.am | 3 ++- src/lib/efl/Efl.h | 3 ++- src/lib/efl/interfaces/efl_interfaces_main.c | 3 ++- .../{efl_ui_range.eo => efl_ui_range_display.eo} | 23 ++++--------------- src/lib/efl/interfaces/efl_ui_range_interactive.eo | 26 ++++++++++++++++++++++ src/lib/efl/interfaces/meson.build | 3 ++- src/lib/elementary/efl_ui_progressbar.c | 16 ++++++------- src/lib/elementary/efl_ui_progressbar.eo | 6 ++--- src/lib/elementary/efl_ui_progressbar_part.eo | 6 ++--- src/lib/elementary/efl_ui_slider.c | 12 +++++----- src/lib/elementary/efl_ui_slider.eo | 8 +++---- src/lib/elementary/efl_ui_spin.c | 12 +++++----- src/lib/elementary/efl_ui_spin.eo | 8 +++---- src/lib/elementary/efl_ui_spin_button.c | 2 +- src/lib/elementary/efl_ui_spin_button.eo | 2 +- src/lib/elementary/elm_flipselector.c | 12 +++++----- src/lib/elementary/elm_flipselector.eo | 8 +++---- src/lib/elementary/elm_spinner.c | 12 +++++----- src/lib/elementary/elm_spinner.eo | 8 +++---- 19 files changed, 94 insertions(+), 79 deletions(-) rename src/lib/efl/interfaces/{efl_ui_range.eo => efl_ui_range_display.eo} (72%) create mode 100644 src/lib/efl/interfaces/efl_ui_range_interactive.eo diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index b69f3b6..88284dc 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -58,7 +58,8 @@ efl_eolian_files = \ lib/efl/interfaces/efl_ui_i18n.eo \ lib/efl/interfaces/efl_ui_direction.eo \ lib/efl/interfaces/efl_ui_drag.eo \ - lib/efl/interfaces/efl_ui_range.eo \ + lib/efl/interfaces/efl_ui_range_display.eo \ + lib/efl/interfaces/efl_ui_range_interactive.eo \ lib/efl/interfaces/efl_ui_view.eo \ lib/efl/interfaces/efl_ui_model_connect.eo \ lib/efl/interfaces/efl_ui_factory.eo \ diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index c150cdc..1066d00 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h @@ -97,7 +97,8 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command; #include "interfaces/efl_ui_i18n.eo.h" #include "interfaces/efl_ui_direction.eo.h" #include "interfaces/efl_ui_drag.eo.h" -#include "interfaces/efl_ui_range.eo.h" +#include "interfaces/efl_ui_range_display.eo.h" +#include "interfaces/efl_ui_range_interactive.eo.h" #include "interfaces/efl_ui_autorepeat.eo.h" #include "interfaces/efl_ui_draggable.eo.h" #include "interfaces/efl_ui_clickable.eo.h" diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c index d1f9b80..4e6c699 100644 --- a/src/lib/efl/interfaces/efl_interfaces_main.c +++ b/src/lib/efl/interfaces/efl_interfaces_main.c @@ -66,7 +66,8 @@ #include "interfaces/efl_ui_i18n.eo.c" #include "interfaces/efl_ui_direction.eo.c" #include "interfaces/efl_ui_drag.eo.c" -#include "interfaces/efl_ui_range.eo.c" +#include "interfaces/efl_ui_range_display.eo.c" +#include "interfaces/efl_ui_range_interactive.eo.c" #include "interfaces/efl_ui_autorepeat.eo.c" #include "interfaces/efl_ui_view.eo.c" #include "interfaces/efl_ui_model_connect.eo.c" diff --git a/src/lib/efl/interfaces/efl_ui_range.eo b/src/lib/efl/interfaces/efl_ui_range_display.eo similarity index 72% rename from src/lib/efl/interfaces/efl_ui_range.eo rename to src/lib/efl/interfaces/efl_ui_range_display.eo index a387ef1..3a3891d 100644 --- a/src/lib/efl/interfaces/efl_ui_range.eo +++ b/src/lib/efl/interfaces/efl_ui_range_display.eo @@ -1,6 +1,7 @@ -interface Efl.Ui.Range +interface Efl.Ui.Range_Display { - [[Efl UI progress interface]] + [[Interface that contains properties regarding the displaying of a range.]] + eo_prefix: efl_ui_range; methods { @property range_value { [[Control the range value (in percentage) on a given range widget @@ -26,7 +27,7 @@ interface Efl.Ui.Range If actual value is less than $min, it will be updated to $min. If it is bigger then $max, will be updated to $max. The actual value - can be obtained with @Efl.Ui.Range.range_value.get + can be obtained with @Efl.Ui.Range_Display.range_value.get The minimum and maximum values may be different for each class. @@ -46,21 +47,5 @@ interface Efl.Ui.Range max: double; [[The maximum value.]] } } - @property range_step { - [[Control the step used to increment or decrement values for given widget. - - This value will be incremented or decremented to the displayed value. - - By default step value is equal to 1. - - Warning: The step value should be bigger than 0.]] - set { - } - get { - } - values { - step: double; [[The step value.]] - } - } } } diff --git a/src/lib/efl/interfaces/efl_ui_range_interactive.eo b/src/lib/efl/interfaces/efl_ui_range_interactive.eo new file mode 100644 index 0000000..d7114e8 --- /dev/null +++ b/src/lib/efl/interfaces/efl_ui_range_interactive.eo @@ -0,0 +1,26 @@ +interface Efl.Ui.Range_Interactive extends Efl.Ui.Range_Display +{ + [[Interface that extends the normal displaying properties with usage properties. + + The properties defined here are used to manipulate the way a user interacts with a displayed range. + ]] + eo_prefix: efl_ui_range; + methods { + @property range_step { + [[Control the step used to increment or decrement values for given widget. + + This value will be incremented or decremented to the displayed value. + + By default step value is equal to 1. + + Warning: The step value should be bigger than 0.]] + set { + } + get { + } + values { + step: double; [[The step value.]] + } + } + } +} diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build index 13f71e4..b28ed0f 100644 --- a/src/lib/efl/interfaces/meson.build +++ b/src/lib/efl/interfaces/meson.build @@ -84,7 +84,8 @@ pub_eo_files = [ 'efl_ui_i18n.eo', 'efl_ui_direction.eo', 'efl_ui_drag.eo', - 'efl_ui_range.eo', + 'efl_ui_range_display.eo', + 'efl_ui_range_interactive.eo', 'efl_ui_view.eo', 'efl_ui_model_connect.eo', 'efl_ui_factory.eo', diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index 867dddd..65e912c 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -611,7 +611,7 @@ _progressbar_part_value_get(Efl_Ui_Progressbar_Data *sd, const char* part) } EOLIAN static void -_efl_ui_progressbar_efl_ui_range_range_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double val) +_efl_ui_progressbar_efl_ui_range_display_range_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double val) { if (EINA_DBL_EQ(sd->val, val)) return; @@ -622,7 +622,7 @@ _efl_ui_progressbar_efl_ui_range_range_value_set(Eo *obj, Efl_Ui_Progressbar_Dat } EOLIAN static double -_efl_ui_progressbar_efl_ui_range_range_value_get(const Eo *obj, Efl_Ui_Progressbar_Data *sd EINA_UNUSED) +_efl_ui_progressbar_efl_ui_range_display_range_value_get(const Eo *obj, Efl_Ui_Progressbar_Data *sd EINA_UNUSED) { if (elm_widget_is_legacy(obj)) return efl_ui_range_value_get(efl_part(obj, "elm.cur.progressbar")); @@ -691,7 +691,7 @@ _efl_ui_progressbar_pulse_get(const Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data } EOLIAN static void -_efl_ui_progressbar_efl_ui_range_range_min_max_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double min, double max) +_efl_ui_progressbar_efl_ui_range_display_range_min_max_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double min, double max) { if (elm_widget_is_legacy(obj)) _progress_part_min_max_set(obj, sd, "elm.cur.progressbar", min, max); @@ -700,7 +700,7 @@ _efl_ui_progressbar_efl_ui_range_range_min_max_set(Eo *obj, Efl_Ui_Progressbar_D } EOLIAN static void -_efl_ui_progressbar_efl_ui_range_range_min_max_get(const Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd, double *min, double *max) +_efl_ui_progressbar_efl_ui_range_display_range_min_max_get(const Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd, double *min, double *max) { if (min) *min = sd->val_min; if (max) *max = sd->val_max; @@ -734,7 +734,7 @@ _efl_ui_progressbar_efl_part_part_get(const Eo *obj, Efl_Ui_Progressbar_Data *sd } EOLIAN static void -_efl_ui_progressbar_part_efl_ui_range_range_value_set(Eo *obj, void *_pd EINA_UNUSED, double val) +_efl_ui_progressbar_part_efl_ui_range_display_range_value_set(Eo *obj, void *_pd EINA_UNUSED, double val) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); @@ -743,7 +743,7 @@ _efl_ui_progressbar_part_efl_ui_range_range_value_set(Eo *obj, void *_pd EINA_UN } EOLIAN static double -_efl_ui_progressbar_part_efl_ui_range_range_value_get(const Eo *obj, void *_pd EINA_UNUSED) +_efl_ui_progressbar_part_efl_ui_range_display_range_value_get(const Eo *obj, void *_pd EINA_UNUSED) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); @@ -784,7 +784,7 @@ _efl_ui_progressbar_efl_ui_i18n_mirrored_set(Eo *obj EINA_UNUSED, Efl_Ui_Progres // EOLIAN static void -_efl_ui_progressbar_part_efl_ui_range_range_min_max_set(Eo *obj, void *_pd EINA_UNUSED, double min, double max) +_efl_ui_progressbar_part_efl_ui_range_display_range_min_max_set(Eo *obj, void *_pd EINA_UNUSED, double min, double max) { Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); @@ -793,7 +793,7 @@ _efl_ui_progressbar_part_efl_ui_range_range_min_max_set(Eo *obj, void *_pd EINA_ } EOLIAN static void -_efl_ui_progressbar_part_efl_ui_range_range_min_max_get(const Eo *obj, void *_pd EINA_UNUSED, double *min, double *max) +_efl_ui_progressbar_part_efl_ui_range_display_range_min_max_get(const Eo *obj, void *_pd EINA_UNUSED, double *min, double *max) { Efl_Ui_Progress_Status *ps; Eina_List *l; diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo index e81aeb4..44a33fc 100644 --- a/src/lib/elementary/efl_ui_progressbar.eo +++ b/src/lib/elementary/efl_ui_progressbar.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Progressbar extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.Format, +class Efl.Ui.Progressbar extends Efl.Ui.Layout implements Efl.Ui.Range_Display, Efl.Ui.Format, Efl.Ui.Direction, Efl.Access.Value, Efl.Text, Efl.Content, Efl.Text_Markup { @@ -51,8 +51,8 @@ class Efl.Ui.Progressbar extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.F implements { Efl.Object.constructor; Efl.Ui.Widget.theme_apply; - Efl.Ui.Range.range_value { get; set; } - Efl.Ui.Range.range_min_max {get; set; } + Efl.Ui.Range_Display.range_value { get; set; } + Efl.Ui.Range_Display.range_min_max {get; set; } Efl.Ui.Direction.direction { get; set; } Efl.Ui.Format.format_cb { set; } Efl.Part.part_get; diff --git a/src/lib/elementary/efl_ui_progressbar_part.eo b/src/lib/elementary/efl_ui_progressbar_part.eo index 13924fc..3ab0579 100644 --- a/src/lib/elementary/efl_ui_progressbar_part.eo +++ b/src/lib/elementary/efl_ui_progressbar_part.eo @@ -1,9 +1,9 @@ -class Efl.Ui.Progressbar_Part extends Efl.Ui.Layout_Part implements Efl.Ui.Range +class Efl.Ui.Progressbar_Part extends Efl.Ui.Layout_Part implements Efl.Ui.Range_Display { [[Elementary progressbar internal part class]] data: null; implements { - Efl.Ui.Range.range_value { set; get; } - Efl.Ui.Range.range_min_max {get; set; } + Efl.Ui.Range_Display.range_value { set; get; } + Efl.Ui.Range_Display.range_min_max {get; set; } } } diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index 12b7c46..7115e70 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -735,7 +735,7 @@ _efl_ui_slider_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Efl_Ui_ } EOLIAN static void -_efl_ui_slider_efl_ui_range_range_min_max_set(Eo *obj, Efl_Ui_Slider_Data *sd, double min, double max) +_efl_ui_slider_efl_ui_range_display_range_min_max_set(Eo *obj, Efl_Ui_Slider_Data *sd, double min, double max) { if ((sd->val_min == min) && (sd->val_max == max)) return; sd->val_min = min; @@ -747,14 +747,14 @@ _efl_ui_slider_efl_ui_range_range_min_max_set(Eo *obj, Efl_Ui_Slider_Data *sd, d } EOLIAN static void -_efl_ui_slider_efl_ui_range_range_min_max_get(const Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *min, double *max) +_efl_ui_slider_efl_ui_range_display_range_min_max_get(const Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *min, double *max) { if (min) *min = sd->val_min; if (max) *max = sd->val_max; } EOLIAN static void -_efl_ui_slider_efl_ui_range_range_value_set(Eo *obj, Efl_Ui_Slider_Data *sd, double val) +_efl_ui_slider_efl_ui_range_display_range_value_set(Eo *obj, Efl_Ui_Slider_Data *sd, double val) { if (sd->val == val) return; sd->val = val; @@ -766,19 +766,19 @@ _efl_ui_slider_efl_ui_range_range_value_set(Eo *obj, Efl_Ui_Slider_Data *sd, dou } EOLIAN static double -_efl_ui_slider_efl_ui_range_range_value_get(const Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) +_efl_ui_slider_efl_ui_range_display_range_value_get(const Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) { return sd->val; } EOLIAN static double -_efl_ui_slider_efl_ui_range_range_step_get(const Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) +_efl_ui_slider_efl_ui_range_interactive_range_step_get(const Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) { return sd->step; } EOLIAN static void -_efl_ui_slider_efl_ui_range_range_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double step) +_efl_ui_slider_efl_ui_range_interactive_range_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double step) { if (sd->step == step) return; diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo index 43bb166..79b233e 100644 --- a/src/lib/elementary/efl_ui_slider.eo +++ b/src/lib/elementary/efl_ui_slider.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Slider extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.Direction, +class Efl.Ui.Slider extends Efl.Ui.Layout implements Efl.Ui.Range_Interactive, Efl.Ui.Direction, Efl.Access.Value, Efl.Access.Widget.Action, Efl.Content @@ -12,9 +12,9 @@ class Efl.Ui.Slider extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.Direct Efl.Ui.Widget.on_access_activate; Efl.Ui.Focus.Object.on_focus_update; Efl.Ui.Widget.widget_event; - Efl.Ui.Range.range_value { get; set; } - Efl.Ui.Range.range_min_max {get; set; } - Efl.Ui.Range.range_step { get; set; } + Efl.Ui.Range_Display.range_value { get; set; } + Efl.Ui.Range_Display.range_min_max {get; set; } + Efl.Ui.Range_Interactive.range_step { get; set; } Efl.Ui.Direction.direction { get; set; } Efl.Access.Value.value_and_text { get; set; } Efl.Access.Value.range { get; } diff --git a/src/lib/elementary/efl_ui_spin.c b/src/lib/elementary/efl_ui_spin.c index 151fa88..a3b345e 100644 --- a/src/lib/elementary/efl_ui_spin.c +++ b/src/lib/elementary/efl_ui_spin.c @@ -310,7 +310,7 @@ _efl_ui_spin_efl_ui_format_format_cb_set(Eo *obj, Efl_Ui_Spin_Data *sd, void *fu } EOLIAN static void -_efl_ui_spin_efl_ui_range_range_min_max_set(Eo *obj, Efl_Ui_Spin_Data *sd, double min, double max) +_efl_ui_spin_efl_ui_range_display_range_min_max_set(Eo *obj, Efl_Ui_Spin_Data *sd, double min, double max) { if (max < min) { @@ -331,14 +331,14 @@ _efl_ui_spin_efl_ui_range_range_min_max_set(Eo *obj, Efl_Ui_Spin_Data *sd, doubl } EOLIAN static void -_efl_ui_spin_efl_ui_range_range_min_max_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Data *sd, double *min, double *max) +_efl_ui_spin_efl_ui_range_display_range_min_max_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Data *sd, double *min, double *max) { if (min) *min = sd->val_min; if (max) *max = sd->val_max; } EOLIAN static void -_efl_ui_spin_efl_ui_range_range_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Data *sd, double step) +_efl_ui_spin_efl_ui_range_interactive_range_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Data *sd, double step) { if (step <= 0) { @@ -350,13 +350,13 @@ _efl_ui_spin_efl_ui_range_range_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Data * } EOLIAN static double -_efl_ui_spin_efl_ui_range_range_step_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Data *sd) +_efl_ui_spin_efl_ui_range_interactive_range_step_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Data *sd) { return sd->step; } EOLIAN static void -_efl_ui_spin_efl_ui_range_range_value_set(Eo *obj, Efl_Ui_Spin_Data *sd, double val) +_efl_ui_spin_efl_ui_range_display_range_value_set(Eo *obj, Efl_Ui_Spin_Data *sd, double val) { if (val < sd->val_min) val = sd->val_min; @@ -378,7 +378,7 @@ _efl_ui_spin_efl_ui_range_range_value_set(Eo *obj, Efl_Ui_Spin_Data *sd, double } EOLIAN static double -_efl_ui_spin_efl_ui_range_range_value_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Data *sd) +_efl_ui_spin_efl_ui_range_display_range_value_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Data *sd) { return sd->val; } diff --git a/src/lib/elementary/efl_ui_spin.eo b/src/lib/elementary/efl_ui_spin.eo index 8ec81df..60232c7 100644 --- a/src/lib/elementary/efl_ui_spin.eo +++ b/src/lib/elementary/efl_ui_spin.eo @@ -5,7 +5,7 @@ struct Efl.Ui.Spin_Special_Value label: string; [[String to replace]] } -class Efl.Ui.Spin extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.Format, +class Efl.Ui.Spin extends Efl.Ui.Layout implements Efl.Ui.Range_Interactive, Efl.Ui.Format, Efl.Access.Value, Efl.Access.Widget.Action { [[A Spin. @@ -37,9 +37,9 @@ class Efl.Ui.Spin extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.Format, Efl.Object.constructor; Efl.Object.destructor; Efl.Ui.Widget.widget_event; - Efl.Ui.Range.range_min_max { get; set; } - Efl.Ui.Range.range_step { get; set; } - Efl.Ui.Range.range_value { get; set; } + Efl.Ui.Range_Display.range_min_max { get; set; } + Efl.Ui.Range_Interactive.range_step { get; set; } + Efl.Ui.Range_Display.range_value { get; set; } Efl.Ui.Format.format_cb { set; } } events { diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c index fbe3646..3442de9 100644 --- a/src/lib/elementary/efl_ui_spin_button.c +++ b/src/lib/elementary/efl_ui_spin_button.c @@ -901,7 +901,7 @@ _efl_ui_spin_button_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Ef } EOLIAN static void -_efl_ui_spin_button_efl_ui_range_range_value_set(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED, double val) +_efl_ui_spin_button_efl_ui_range_display_range_value_set(Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED, double val) { efl_ui_range_value_set(efl_super(obj, MY_CLASS), val); diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo index cd55741..840f5c8 100644 --- a/src/lib/elementary/efl_ui_spin_button.eo +++ b/src/lib/elementary/efl_ui_spin_button.eo @@ -67,7 +67,7 @@ class Efl.Ui.Spin_Button extends Efl.Ui.Spin implements Efl.Ui.Focus.Composition Efl.Ui.Widget.theme_apply; Efl.Ui.Widget.widget_event; Efl.Ui.Focus.Object.on_focus_update; - Efl.Ui.Range.range_value { set; } + Efl.Ui.Range_Display.range_value { set; } Efl.Ui.Direction.direction { get; set; } Efl.Access.Object.i18n_name { get; } Efl.Access.Value.value_and_text { get; set; } diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index ec77178..4aaeb9f 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -508,7 +508,7 @@ _items_add(Evas_Object *obj) } EOLIAN static void -_elm_flipselector_efl_ui_range_range_min_max_set(Eo *obj, Elm_Flipselector_Data *sd, double min, double max) +_elm_flipselector_efl_ui_range_display_range_min_max_set(Eo *obj, Elm_Flipselector_Data *sd, double min, double max) { if ((sd->val_min == min) && (sd->val_max == max)) return; @@ -519,14 +519,14 @@ _elm_flipselector_efl_ui_range_range_min_max_set(Eo *obj, Elm_Flipselector_Data } EOLIAN static void -_elm_flipselector_efl_ui_range_range_min_max_get(const Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd, double *min, double *max) +_elm_flipselector_efl_ui_range_display_range_min_max_get(const Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd, double *min, double *max) { if (min) *min = sd->val_min; if (max) *max = sd->val_max; } EOLIAN static void -_elm_flipselector_efl_ui_range_range_step_set(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd, double step) +_elm_flipselector_efl_ui_range_interactive_range_step_set(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd, double step) { if (sd->step == step) return; @@ -538,13 +538,13 @@ _elm_flipselector_efl_ui_range_range_step_set(Eo *obj EINA_UNUSED, Elm_Flipselec } EOLIAN static double -_elm_flipselector_efl_ui_range_range_step_get(const Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd) +_elm_flipselector_efl_ui_range_interactive_range_step_get(const Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd) { return sd->step; } EOLIAN static double -_elm_flipselector_efl_ui_range_range_value_get(const Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd) +_elm_flipselector_efl_ui_range_display_range_value_get(const Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd) { if (sd->val_min == 0 && sd->val_max == 0) { @@ -556,7 +556,7 @@ _elm_flipselector_efl_ui_range_range_value_get(const Eo *obj EINA_UNUSED, Elm_Fl } EOLIAN static void -_elm_flipselector_efl_ui_range_range_value_set(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd, double val) +_elm_flipselector_efl_ui_range_display_range_value_set(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd, double val) { Eina_List *l; Elm_Object_Item *it; diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo index 4b4c645..aa47b51 100644 --- a/src/lib/elementary/elm_flipselector.eo +++ b/src/lib/elementary/elm_flipselector.eo @@ -1,4 +1,4 @@ -class Elm.Flipselector extends Efl.Ui.Layout implements Efl.Ui.Range, +class Elm.Flipselector extends Efl.Ui.Layout implements Efl.Ui.Range_Interactive, Efl.Access.Widget.Action, Efl.Ui.Selectable, Efl.Ui.Legacy { @@ -169,9 +169,9 @@ class Elm.Flipselector extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.Widget.screen_reader; // // - Efl.Ui.Range.range_min_max { get; set; } - Efl.Ui.Range.range_step { get; set; } - Efl.Ui.Range.range_value { get; set; } + Efl.Ui.Range_Display.range_min_max { get; set; } + Efl.Ui.Range_Interactive.range_step { get; set; } + Efl.Ui.Range_Display.range_value { get; set; } Efl.Access.Widget.Action.elm_actions { get; } //TIZEN_ONLY(20150716) : fix accessible_at_point getter Efl.Access.Component.accessible_at_point_get; diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index 57cb078..8863463 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -1746,7 +1746,7 @@ _elm_spinner_label_format_get(const Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) } EOLIAN static void -_elm_spinner_efl_ui_range_range_min_max_set(Eo *obj, Elm_Spinner_Data *sd, double min, double max) +_elm_spinner_efl_ui_range_display_range_min_max_set(Eo *obj, Elm_Spinner_Data *sd, double min, double max) { //TIZEN_ONLY(20180517): Call changed callback when value changed in min_max_set. Eina_Bool value_changed = EINA_FALSE; @@ -1787,26 +1787,26 @@ _elm_spinner_efl_ui_range_range_min_max_set(Eo *obj, Elm_Spinner_Data *sd, doubl } EOLIAN static void -_elm_spinner_efl_ui_range_range_min_max_get(const Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *min, double *max) +_elm_spinner_efl_ui_range_display_range_min_max_get(const Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double *min, double *max) { if (min) *min = sd->val_min; if (max) *max = sd->val_max; } EOLIAN static void -_elm_spinner_efl_ui_range_range_step_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double step) +_elm_spinner_efl_ui_range_interactive_range_step_set(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd, double step) { sd->step = step; } EOLIAN static double -_elm_spinner_efl_ui_range_range_step_get(const Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) +_elm_spinner_efl_ui_range_interactive_range_step_get(const Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) { return sd->step; } EOLIAN static void -_elm_spinner_efl_ui_range_range_value_set(Eo *obj, Elm_Spinner_Data *sd, double val) +_elm_spinner_efl_ui_range_display_range_value_set(Eo *obj, Elm_Spinner_Data *sd, double val) { if (sd->val == val) return; @@ -1834,7 +1834,7 @@ _elm_spinner_efl_ui_range_range_value_set(Eo *obj, Elm_Spinner_Data *sd, double } EOLIAN static double -_elm_spinner_efl_ui_range_range_value_get(const Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) +_elm_spinner_efl_ui_range_display_range_value_get(const Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd) { return sd->val; } diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo index 1ce629c..92839ea 100644 --- a/src/lib/elementary/elm_spinner.eo +++ b/src/lib/elementary/elm_spinner.eo @@ -1,4 +1,4 @@ -class Elm.Spinner extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.Focus.Composition, +class Elm.Spinner extends Efl.Ui.Layout implements Efl.Ui.Range_Interactive, Efl.Ui.Focus.Composition, Efl.Access.Value, Efl.Access.Widget.Action, Efl.Ui.Legacy { [[Elementary spinner class]] @@ -180,9 +180,9 @@ class Elm.Spinner extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.Focus.Co */ Efl.Ui.I18n.mirrored { get; set; } /* END */ - Efl.Ui.Range.range_min_max { get; set; } - Efl.Ui.Range.range_step { get; set; } - Efl.Ui.Range.range_value { get; set; } + Efl.Ui.Range_Display.range_min_max { get; set; } + Efl.Ui.Range_Interactive.range_step { get; set; } + Efl.Ui.Range_Display.range_value { get; set; } Efl.Access.Object.i18n_name { get; } Efl.Access.Value.value_and_text { get; set; } Efl.Access.Value.range { get; } -- 2.7.4