summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Makefile_Elementary.am2
-rw-r--r--src/bin/elementary/test_ui_slider_interval.c6
-rw-r--r--src/lib/elementary/efl_ui_slider.c22
-rw-r--r--src/lib/elementary/efl_ui_slider.eo3
-rw-r--r--src/lib/elementary/efl_ui_slider_part_indicator.eo (renamed from src/lib/elementary/efl_ui_slider_part.eo)4
-rw-r--r--src/lib/elementary/elm_slider.h2
6 files changed, 20 insertions, 19 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index d10ea956d9..779c9eed59 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -70,7 +70,7 @@ elm_public_eolian_files = \
70 lib/elementary/efl_ui_multibuttonentry_part.eo \ 70 lib/elementary/efl_ui_multibuttonentry_part.eo \
71 lib/elementary/efl_ui_panes_part.eo \ 71 lib/elementary/efl_ui_panes_part.eo \
72 lib/elementary/efl_ui_progressbar_part.eo \ 72 lib/elementary/efl_ui_progressbar_part.eo \
73 lib/elementary/efl_ui_slider_part.eo \ 73 lib/elementary/efl_ui_slider_part_indicator.eo \
74 lib/elementary/efl_ui_textpath_part.eo \ 74 lib/elementary/efl_ui_textpath_part.eo \
75 lib/elementary/efl_ui_widget_part.eo \ 75 lib/elementary/efl_ui_widget_part.eo \
76 lib/elementary/efl_ui_widget_part_bg.eo \ 76 lib/elementary/efl_ui_widget_part_bg.eo \
diff --git a/src/bin/elementary/test_ui_slider_interval.c b/src/bin/elementary/test_ui_slider_interval.c
index c942c58fed..1e7f4cf063 100644
--- a/src/bin/elementary/test_ui_slider_interval.c
+++ b/src/bin/elementary/test_ui_slider_interval.c
@@ -42,7 +42,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
42 42
43 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, 43 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
44 efl_text_set(efl_added, "Horizontal"), 44 efl_text_set(efl_added, "Horizontal"),
45 efl_ui_slider_part_visible_mode_set(efl_part(efl_added, "indicator"), 45 efl_ui_slider_part_indicator_visible_mode_set(efl_part(efl_added, "indicator"),
46 EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE), 46 EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE),
47 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), 47 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)),
48 efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.5f"), 48 efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.5f"),
@@ -98,7 +98,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
98 98
99 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, 99 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx,
100 efl_text_set(efl_added, "Always Show Indicator:"), 100 efl_text_set(efl_added, "Always Show Indicator:"),
101 efl_ui_slider_part_visible_mode_set(efl_part(efl_added, "indicator"), 101 efl_ui_slider_part_indicator_visible_mode_set(efl_part(efl_added, "indicator"),
102 EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS), 102 EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS),
103 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), 103 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)),
104 efl_ui_format_string_set(efl_added, "%1.0f units"), 104 efl_ui_format_string_set(efl_added, "%1.0f units"),
@@ -110,7 +110,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
110 110
111 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, 111 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
112 efl_text_set(efl_added, "Limited (100-500)"), 112 efl_text_set(efl_added, "Limited (100-500)"),
113 efl_ui_slider_part_visible_mode_set(efl_part(efl_added, "indicator"), 113 efl_ui_slider_part_indicator_visible_mode_set(efl_part(efl_added, "indicator"),
114 EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS), 114 EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS),
115 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(260, 0)), 115 efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(260, 0)),
116 efl_ui_format_string_set(efl_added, "%1.0f units"), 116 efl_ui_format_string_set(efl_added, "%1.0f units"),
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 9f2926933d..d316278172 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -1442,13 +1442,13 @@ _efl_ui_slider_efl_part_part(const Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED,
1442 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL); 1442 EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
1443 1443
1444 if (eina_streq(part, "indicator")) 1444 if (eina_streq(part, "indicator"))
1445 return ELM_PART_IMPLEMENT(EFL_UI_SLIDER_PART_CLASS, obj, part); 1445 return ELM_PART_IMPLEMENT(EFL_UI_SLIDER_PART_INDICATOR_CLASS, obj, part);
1446 1446
1447 return efl_part(efl_super(obj, MY_CLASS), part); 1447 return efl_part(efl_super(obj, MY_CLASS), part);
1448} 1448}
1449 1449
1450EOLIAN static void 1450EOLIAN static void
1451_efl_ui_slider_part_efl_ui_format_format_cb_set(Eo *obj, void *_pd EINA_UNUSED, void *func_data, Efl_Ui_Format_Func_Cb func, Eina_Free_Cb func_free_cb) 1451_efl_ui_slider_part_indicator_efl_ui_format_format_cb_set(Eo *obj, void *_pd EINA_UNUSED, void *func_data, Efl_Ui_Format_Func_Cb func, Eina_Free_Cb func_free_cb)
1452{ 1452{
1453 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 1453 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
1454 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); 1454 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
@@ -1493,7 +1493,7 @@ _indi_default_format_free_cb(void *data)
1493} 1493}
1494 1494
1495EOLIAN static void 1495EOLIAN static void
1496_efl_ui_slider_part_efl_ui_format_format_string_set(Eo *obj, void *_pd EINA_UNUSED, const char *template) 1496_efl_ui_slider_part_indicator_efl_ui_format_format_string_set(Eo *obj, void *_pd EINA_UNUSED, const char *template)
1497{ 1497{
1498 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 1498 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
1499 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); 1499 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
@@ -1505,7 +1505,7 @@ _efl_ui_slider_part_efl_ui_format_format_string_set(Eo *obj, void *_pd EINA_UNUS
1505} 1505}
1506 1506
1507EOLIAN static const char * 1507EOLIAN static const char *
1508_efl_ui_slider_part_efl_ui_format_format_string_get(Eo *obj, void *_pd EINA_UNUSED) 1508_efl_ui_slider_part_indicator_efl_ui_format_format_string_get(Eo *obj, void *_pd EINA_UNUSED)
1509{ 1509{
1510 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 1510 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
1511 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); 1511 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
@@ -1514,7 +1514,7 @@ _efl_ui_slider_part_efl_ui_format_format_string_get(Eo *obj, void *_pd EINA_UNUS
1514} 1514}
1515 1515
1516EOLIAN static void 1516EOLIAN static void
1517_efl_ui_slider_part_visible_mode_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Slider_Indicator_Visible_Mode indicator_visible_mode) 1517_efl_ui_slider_part_indicator_visible_mode_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Slider_Indicator_Visible_Mode indicator_visible_mode)
1518{ 1518{
1519 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 1519 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
1520 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); 1520 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
@@ -1527,7 +1527,7 @@ _efl_ui_slider_part_visible_mode_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Slid
1527} 1527}
1528 1528
1529EOLIAN static Efl_Ui_Slider_Indicator_Visible_Mode 1529EOLIAN static Efl_Ui_Slider_Indicator_Visible_Mode
1530_efl_ui_slider_part_visible_mode_get(Eo *obj, void *_pd EINA_UNUSED) 1530_efl_ui_slider_part_indicator_visible_mode_get(Eo *obj, void *_pd EINA_UNUSED)
1531{ 1531{
1532 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS); 1532 Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
1533 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS); 1533 Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
@@ -1536,7 +1536,7 @@ _efl_ui_slider_part_visible_mode_get(Eo *obj, void *_pd EINA_UNUSED)
1536 return sd->indicator_visible_mode; 1536 return sd->indicator_visible_mode;
1537} 1537}
1538 1538
1539#include "efl_ui_slider_part.eo.c" 1539#include "efl_ui_slider_part_indicator.eo.c"
1540 1540
1541/* Efl.Part end */ 1541/* Efl.Part end */
1542 1542
@@ -1761,7 +1761,7 @@ elm_slider_indicator_format_function_set(Evas_Object *obj, slider_func_type func
1761EAPI void 1761EAPI void
1762elm_slider_indicator_show_on_focus_set(Evas_Object *obj, Eina_Bool flag) 1762elm_slider_indicator_show_on_focus_set(Evas_Object *obj, Eina_Bool flag)
1763{ 1763{
1764 efl_ui_slider_part_visible_mode_set(efl_part(obj, "indicator"), 1764 efl_ui_slider_part_indicator_visible_mode_set(efl_part(obj, "indicator"),
1765 flag ? ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS 1765 flag ? ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS
1766 : ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT); 1766 : ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT);
1767} 1767}
@@ -1769,7 +1769,7 @@ elm_slider_indicator_show_on_focus_set(Evas_Object *obj, Eina_Bool flag)
1769EAPI Eina_Bool 1769EAPI Eina_Bool
1770elm_slider_indicator_show_on_focus_get(const Evas_Object *obj) 1770elm_slider_indicator_show_on_focus_get(const Evas_Object *obj)
1771{ 1771{
1772 return (efl_ui_slider_part_visible_mode_get(efl_part(obj, "indicator")) 1772 return (efl_ui_slider_part_indicator_visible_mode_get(efl_part(obj, "indicator"))
1773 == EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS); 1773 == EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS);
1774} 1774}
1775 1775
@@ -1810,13 +1810,13 @@ elm_slider_indicator_show_get(const Evas_Object *obj)
1810EAPI void 1810EAPI void
1811elm_slider_indicator_visible_mode_set(Evas_Object *obj, Elm_Slider_Indicator_Visible_Mode indicator_visible_mode) 1811elm_slider_indicator_visible_mode_set(Evas_Object *obj, Elm_Slider_Indicator_Visible_Mode indicator_visible_mode)
1812{ 1812{
1813 efl_ui_slider_part_visible_mode_set(efl_part(obj, "indicator"), indicator_visible_mode); 1813 efl_ui_slider_part_indicator_visible_mode_set(efl_part(obj, "indicator"), indicator_visible_mode);
1814} 1814}
1815 1815
1816EAPI Elm_Slider_Indicator_Visible_Mode 1816EAPI Elm_Slider_Indicator_Visible_Mode
1817elm_slider_indicator_visible_mode_get(const Evas_Object *obj) 1817elm_slider_indicator_visible_mode_get(const Evas_Object *obj)
1818{ 1818{
1819 return efl_ui_slider_part_visible_mode_get(efl_part(obj, "indicator")); 1819 return efl_ui_slider_part_indicator_visible_mode_get(efl_part(obj, "indicator"));
1820} 1820}
1821 1821
1822/* Internal EO APIs and hidden overrides */ 1822/* Internal EO APIs and hidden overrides */
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 99356af0ed..c0b5b0931c 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -30,7 +30,8 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
30 } 30 }
31 } 31 }
32 parts { 32 parts {
33 indicator: Efl.Ui.Slider.Part; [[A floating indicator above the slider.]] 33 indicator: Efl.Ui.Slider.Part_Indicator;
34 [[A floating indicator above the slider.]]
34 } 35 }
35 implements { 36 implements {
36 class.constructor; 37 class.constructor;
diff --git a/src/lib/elementary/efl_ui_slider_part.eo b/src/lib/elementary/efl_ui_slider_part_indicator.eo
index 86b375f604..9930e46031 100644
--- a/src/lib/elementary/efl_ui_slider_part.eo
+++ b/src/lib/elementary/efl_ui_slider_part_indicator.eo
@@ -1,6 +1,6 @@
1import efl_ui; 1import efl_ui;
2 2
3class Efl.Ui.Slider.Part (Efl.Ui.Layout.Part, Efl.Ui.Format) 3class Efl.Ui.Slider.Part_Indicator (Efl.Ui.Layout.Part, Efl.Ui.Format)
4{ 4{
5 [[Elementary slider internal part class]] 5 [[Elementary slider internal part class]]
6 data: null; 6 data: null;
@@ -9,7 +9,7 @@ class Efl.Ui.Slider.Part (Efl.Ui.Layout.Part, Efl.Ui.Format)
9 [[Set/Get the visible mode of indicator. 9 [[Set/Get the visible mode of indicator.
10 ]] 10 ]]
11 values { 11 values {
12 indicator_visible_mode: Efl.Ui.Slider.Indicator_Visible_Mode; [[The indicator visible mode.]] 12 mode: Efl.Ui.Slider.Indicator_Visible_Mode; [[The indicator visible mode.]]
13 } 13 }
14 } 14 }
15 } 15 }
diff --git a/src/lib/elementary/elm_slider.h b/src/lib/elementary/elm_slider.h
index 4182e4e02a..76fc25d6e5 100644
--- a/src/lib/elementary/elm_slider.h
+++ b/src/lib/elementary/elm_slider.h
@@ -77,7 +77,7 @@
77#include "elm_slider_common.h" 77#include "elm_slider_common.h"
78#ifdef EFL_EO_API_SUPPORT 78#ifdef EFL_EO_API_SUPPORT
79#include "efl_ui_slider_eo.h" 79#include "efl_ui_slider_eo.h"
80#include "efl_ui_slider_part.eo.h" 80#include "efl_ui_slider_part_indicator.eo.h"
81#include <efl_ui_slider_interval.eo.h> 81#include <efl_ui_slider_interval.eo.h>
82#endif 82#endif
83#ifndef EFL_NOLEGACY_API_SUPPORT 83#ifndef EFL_NOLEGACY_API_SUPPORT