efl.ui.slider: implement efl.text intf

efl_text_set/get would work on slider text part.

diff --git a/src/bin/elementary/test_slider_interval.c b/src/bin/elementary/test_slider_interval.c
index 8127c9df8bbb6b37e9d6c5c0f097280750b8bb28..14b1a85ae884af976ba7662c4b05bf3584fea6fb 100644 (file)
--- a/src/bin/elementary/test_slider_interval.c
+++ b/src/bin/elementary/test_slider_interval.c
@@ -41,24 +41,25 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
                 efl_content_set(win, efl_added));
 
    sl = efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
+                efl_text_set(efl_added, "horizontal"),
                 efl_ui_slider_indicator_visible_mode_set(efl_added, EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE),
                 efl_ui_range_span_size_set(efl_added, 160),
                 efl_ui_slider_indicator_format_set(efl_added, "%1.5f"),
                 efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9),
                 efl_pack(bx, efl_added));
-   elm_object_text_set(sl, "horizontal");
 
    step = _step_size_calculate(0, 9);
    sl = efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
+                efl_text_set(efl_added, "Manual step"),
                 efl_ui_range_span_size_set(efl_added, 120),
                 efl_ui_range_unit_format_set(efl_added, "%1.1f units"),
                 efl_ui_slider_indicator_format_set(efl_added, "%1.1f"),
                 efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9),
                 efl_ui_slider_step_set(efl_added, step),
                 efl_pack(bx, efl_added));
-   elm_object_text_set(sl, "Manual step");
 
    sl = efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
+                efl_text_set(efl_added, "Disabled"),
                 efl_ui_range_span_size_set(efl_added, 120),
                 efl_ui_range_unit_format_set(efl_added, "%1.0f units"),
                 efl_ui_slider_indicator_format_set(efl_added, "%1.0f"),
@@ -67,13 +68,13 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
                 efl_ui_slider_step_set(efl_added, step),
                 efl_pack(bx, efl_added));
    elm_object_disabled_set(sl, EINA_TRUE);
-   elm_object_text_set(sl, "Disabled");
 
    hbx = efl_add(EFL_UI_BOX_CLASS, bx,
                  efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),
                  efl_pack(bx, efl_added));
 
    sl = efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx,
+                efl_text_set(efl_added, "Vertical"),
                 efl_ui_range_span_size_set(efl_added, 120),
                 efl_ui_range_unit_format_set(efl_added, "%1.0f units"),
                 efl_ui_slider_indicator_format_set(efl_added, "%1.0f"),
@@ -82,9 +83,9 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
                 efl_ui_slider_step_set(efl_added, step),
                 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL),
                 efl_pack(hbx, efl_added));
-   elm_object_text_set(sl, "vertical");
 
    sl = efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx,
+                efl_text_set(efl_added, "Disabled"),
                 efl_ui_range_span_size_set(efl_added, 120),
                 efl_ui_range_unit_format_set(efl_added, "%1.0f units"),
                 efl_ui_slider_indicator_format_set(efl_added, "%1.0f"),
@@ -93,10 +94,10 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
                 efl_ui_slider_step_set(efl_added, step),
                 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL),
                 efl_pack(hbx, efl_added));
-   elm_object_text_set(sl, "vertical");
    elm_object_disabled_set(sl, EINA_TRUE);
 
    sl = efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
+                efl_text_set(efl_added, "Limited(100-500)"),
                 efl_ui_slider_indicator_visible_mode_set(efl_added, EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS),
                 efl_ui_range_span_size_set(efl_added, 120),
                 efl_ui_range_unit_format_set(efl_added, "%1.0f units"),
@@ -106,7 +107,5 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
                 efl_ui_slider_step_set(efl_added, step),
                 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _intv_slider_changed_cb, NULL),
                 efl_pack(bx, efl_added));
-
-   elm_object_text_set(sl, "Limited(100-500)");
 }
 

diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 59eb9cb737709636b815e28ca1295b05e7a8c67d..3bc1f67d20446a1777b4fc3a247f642911c28dd3 100644 (file)
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -1505,6 +1505,10 @@ _efl_ui_slider_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UN
 
 // A11Y Accessibility - END
 
+/* Standard widget overrides */
+
+EFL_TEXT_PART_DEFAULT_IMPLEMENT(efl_ui_slider, Efl_Ui_Slider_Data)
+
 /* Efl.Part begin */
 ELM_PART_OVERRIDE(efl_ui_slider, EFL_UI_SLIDER, EFL_UI_LAYOUT, Efl_Ui_Slider_Data, Elm_Part_Data)
 

diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 963a7b014dfc48f341ff848305ef13050ef7824f..825ac20acabac60eee5db6149e5e5961a89637af 100644 (file)
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -2,7 +2,7 @@ type slider_func_type: __undefined_type; [[Elementary slider function type]]
 type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]]
 
 class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
-                     Efl.Access.Value,
+                     Efl.Access.Value, Efl.Text,
                      Elm.Interface.Atspi_Widget_Action)
 {
    [[Elementary slider class]]
@@ -131,6 +131,7 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
       Efl.Access.Value.increment { get; }
       Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
       Efl.Part.part;
+      Efl.Text.text { get; set; }
    }
    events {
       changed; [[Called when slider changed]]