summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Elementary.am8
-rw-r--r--src/lib/elementary/elm_slider.c4
-rw-r--r--src/lib/elementary/elm_slider.eo25
-rw-r--r--src/lib/elementary/elm_slider.h4
-rw-r--r--src/lib/elementary/elm_slider_eo.c87
-rw-r--r--src/lib/elementary/elm_slider_eo.h24
-rw-r--r--src/lib/elementary/elm_slider_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_slider_part_indicator.eo20
-rw-r--r--src/lib/elementary/elm_slider_part_indicator_eo.c53
-rw-r--r--src/lib/elementary/elm_slider_part_indicator_eo.h45
-rw-r--r--src/lib/elementary/elm_slider_part_indicator_eo.legacy.h19
-rw-r--r--src/lib/elementary/meson.build6
12 files changed, 259 insertions, 53 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index d44bd3c4e7..a43145e8b9 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -94,8 +94,6 @@ elm_public_eolian_files = \
94 lib/elementary/efl_ui_grid.eo \ 94 lib/elementary/efl_ui_grid.eo \
95 lib/elementary/efl_ui_panes_part.eo \ 95 lib/elementary/efl_ui_panes_part.eo \
96 lib/elementary/efl_ui_progressbar_part.eo \ 96 lib/elementary/efl_ui_progressbar_part.eo \
97 lib/elementary/elm_slider.eo \
98 lib/elementary/elm_slider_part_indicator.eo \
99 lib/elementary/efl_ui_textpath_part.eo \ 97 lib/elementary/efl_ui_textpath_part.eo \
100 lib/elementary/efl_ui_widget_part.eo \ 98 lib/elementary/efl_ui_widget_part.eo \
101 lib/elementary/efl_ui_widget_part_bg.eo \ 99 lib/elementary/efl_ui_widget_part_bg.eo \
@@ -385,6 +383,8 @@ lib/elementary/elm_segment_control_item_eo.c \
385lib/elementary/elm_segment_control_item_eo.legacy.c \ 383lib/elementary/elm_segment_control_item_eo.legacy.c \
386lib/elementary/elm_separator_eo.c \ 384lib/elementary/elm_separator_eo.c \
387lib/elementary/elm_separator_eo.legacy.c \ 385lib/elementary/elm_separator_eo.legacy.c \
386lib/elementary/elm_slider_eo.c \
387lib/elementary/elm_slider_part_indicator_eo.c \
388$(NULL) 388$(NULL)
389 389
390elm_legacy_eo_headers = \ 390elm_legacy_eo_headers = \
@@ -566,6 +566,10 @@ lib/elementary/elm_segment_control_item_eo.h \
566lib/elementary/elm_segment_control_item_eo.legacy.h \ 566lib/elementary/elm_segment_control_item_eo.legacy.h \
567lib/elementary/elm_separator_eo.h \ 567lib/elementary/elm_separator_eo.h \
568lib/elementary/elm_separator_eo.legacy.h \ 568lib/elementary/elm_separator_eo.legacy.h \
569lib/elementary/elm_slider_eo.h \
570lib/elementary/elm_slider_eo.legacy.h \
571lib/elementary/elm_slider_part_indicator_eo.h \
572lib/elementary/elm_slider_part_indicator_eo.legacy.h \
569$(NULL) 573$(NULL)
570 574
571 575
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index 511332909c..d5a5f04ea8 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -1193,7 +1193,7 @@ _elm_slider_part_indicator_visible_mode_get(const Eo *obj, void *_pd EINA_UNUSED
1193 return sd->indicator_visible_mode; 1193 return sd->indicator_visible_mode;
1194} 1194}
1195 1195
1196#include "elm_slider_part_indicator.eo.c" 1196#include "elm_slider_part_indicator_eo.c"
1197 1197
1198/* Efl.Part end */ 1198/* Efl.Part end */
1199 1199
@@ -1490,4 +1490,4 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(elm_slider)
1490 EFL_UI_SLIDER_DOWN_KNOB_OPS(elm_slider), \ 1490 EFL_UI_SLIDER_DOWN_KNOB_OPS(elm_slider), \
1491 EFL_UI_SLIDER_MOVE_KNOB_OPS(elm_slider) 1491 EFL_UI_SLIDER_MOVE_KNOB_OPS(elm_slider)
1492 1492
1493#include "elm_slider.eo.c" 1493#include "elm_slider_eo.c"
diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo
deleted file mode 100644
index ce9c87ab5b..0000000000
--- a/src/lib/elementary/elm_slider.eo
+++ /dev/null
@@ -1,25 +0,0 @@
1class Elm.Slider extends Efl.Ui.Slider_Interval implements Efl.Ui.Legacy,
2 Efl.Text, Efl.Text_Markup, Efl.Ui.Format
3{
4 [[Elementary slider class]]
5 eo_prefix: elm_obj_slider;
6 legacy_prefix: elm_slider;
7 parts {
8 indicator: Elm.Slider_Part_Indicator;
9 [[A floating indicator above the slider.]]
10 }
11 implements {
12 class.constructor;
13 Efl.Object.constructor;
14 Efl.Object.destructor;
15 Efl.Canvas.Group.group_calculate;
16 Efl.Ui.Widget.theme_apply;
17 Efl.Ui.Widget.widget_input_event_handler;
18 Efl.Ui.Focus.Object.on_focus_update;
19 Efl.Text.text { get; set; }
20 Efl.Text_Markup.markup { get; set; }
21 Efl.Ui.Format.format_cb { set; }
22 Efl.Ui.L10n.l10n_text { get; set; }
23 Efl.Part.part_get;
24 }
25}
diff --git a/src/lib/elementary/elm_slider.h b/src/lib/elementary/elm_slider.h
index 5e04927026..40aab8301d 100644
--- a/src/lib/elementary/elm_slider.h
+++ b/src/lib/elementary/elm_slider.h
@@ -76,8 +76,8 @@
76 76
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 "elm_slider.eo.h" 79#include "elm_slider_eo.h"
80#include "elm_slider_part_indicator.eo.h" 80#include "elm_slider_part_indicator_eo.h"
81#endif 81#endif
82#ifndef EFL_NOLEGACY_API_SUPPORT 82#ifndef EFL_NOLEGACY_API_SUPPORT
83#include "elm_slider_legacy.h" 83#include "elm_slider_legacy.h"
diff --git a/src/lib/elementary/elm_slider_eo.c b/src/lib/elementary/elm_slider_eo.c
new file mode 100644
index 0000000000..12debeef34
--- /dev/null
+++ b/src/lib/elementary/elm_slider_eo.c
@@ -0,0 +1,87 @@
1
2Efl_Object *_elm_slider_efl_object_constructor(Eo *obj, Elm_Slider_Data *pd);
3
4
5void _elm_slider_efl_object_destructor(Eo *obj, Elm_Slider_Data *pd);
6
7
8void _elm_slider_efl_canvas_group_group_calculate(Eo *obj, Elm_Slider_Data *pd);
9
10
11Eina_Error _elm_slider_efl_ui_widget_theme_apply(Eo *obj, Elm_Slider_Data *pd);
12
13
14Eina_Bool _elm_slider_efl_ui_widget_widget_input_event_handler(Eo *obj, Elm_Slider_Data *pd, const Efl_Event *eo_event, Efl_Canvas_Object *source);
15
16
17Eina_Bool _elm_slider_efl_ui_focus_object_on_focus_update(Eo *obj, Elm_Slider_Data *pd);
18
19
20void _elm_slider_efl_text_text_set(Eo *obj, Elm_Slider_Data *pd, const char *text);
21
22
23const char *_elm_slider_efl_text_text_get(const Eo *obj, Elm_Slider_Data *pd);
24
25
26void _elm_slider_efl_text_markup_markup_set(Eo *obj, Elm_Slider_Data *pd, const char *markup);
27
28
29const char *_elm_slider_efl_text_markup_markup_get(const Eo *obj, Elm_Slider_Data *pd);
30
31
32void _elm_slider_efl_ui_format_format_cb_set(Eo *obj, Elm_Slider_Data *pd, void *func_data, Efl_Ui_Format_Func_Cb func, Eina_Free_Cb func_free_cb);
33
34
35void _elm_slider_efl_ui_l10n_l10n_text_set(Eo *obj, Elm_Slider_Data *pd, const char *label, const char *domain);
36
37
38const char *_elm_slider_efl_ui_l10n_l10n_text_get(const Eo *obj, Elm_Slider_Data *pd, const char **domain);
39
40
41Efl_Object *_elm_slider_efl_part_part_get(const Eo *obj, Elm_Slider_Data *pd, const char *name);
42
43
44static Eina_Bool
45_elm_slider_class_initializer(Efl_Class *klass)
46{
47 const Efl_Object_Ops *opsp = NULL;
48
49 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
50
51#ifndef ELM_SLIDER_EXTRA_OPS
52#define ELM_SLIDER_EXTRA_OPS
53#endif
54
55 EFL_OPS_DEFINE(ops,
56 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_slider_efl_object_constructor),
57 EFL_OBJECT_OP_FUNC(efl_destructor, _elm_slider_efl_object_destructor),
58 EFL_OBJECT_OP_FUNC(efl_canvas_group_calculate, _elm_slider_efl_canvas_group_group_calculate),
59 EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _elm_slider_efl_ui_widget_theme_apply),
60 EFL_OBJECT_OP_FUNC(efl_ui_widget_input_event_handler, _elm_slider_efl_ui_widget_widget_input_event_handler),
61 EFL_OBJECT_OP_FUNC(efl_ui_focus_object_on_focus_update, _elm_slider_efl_ui_focus_object_on_focus_update),
62 EFL_OBJECT_OP_FUNC(efl_text_set, _elm_slider_efl_text_text_set),
63 EFL_OBJECT_OP_FUNC(efl_text_get, _elm_slider_efl_text_text_get),
64 EFL_OBJECT_OP_FUNC(efl_text_markup_set, _elm_slider_efl_text_markup_markup_set),
65 EFL_OBJECT_OP_FUNC(efl_text_markup_get, _elm_slider_efl_text_markup_markup_get),
66 EFL_OBJECT_OP_FUNC(efl_ui_format_cb_set, _elm_slider_efl_ui_format_format_cb_set),
67 EFL_OBJECT_OP_FUNC(efl_ui_l10n_text_set, _elm_slider_efl_ui_l10n_l10n_text_set),
68 EFL_OBJECT_OP_FUNC(efl_ui_l10n_text_get, _elm_slider_efl_ui_l10n_l10n_text_get),
69 EFL_OBJECT_OP_FUNC(efl_part_get, _elm_slider_efl_part_part_get),
70 ELM_SLIDER_EXTRA_OPS
71 );
72 opsp = &ops;
73
74 return efl_class_functions_set(klass, opsp, ropsp);
75}
76
77static const Efl_Class_Description _elm_slider_class_desc = {
78 EO_VERSION,
79 "Elm.Slider",
80 EFL_CLASS_TYPE_REGULAR,
81 sizeof(Elm_Slider_Data),
82 _elm_slider_class_initializer,
83 _elm_slider_class_constructor,
84 NULL
85};
86
87EFL_DEFINE_CLASS(elm_slider_class_get, &_elm_slider_class_desc, EFL_UI_SLIDER_INTERVAL_CLASS, EFL_UI_LEGACY_INTERFACE, EFL_TEXT_INTERFACE, EFL_TEXT_MARKUP_INTERFACE, EFL_UI_FORMAT_MIXIN, NULL);
diff --git a/src/lib/elementary/elm_slider_eo.h b/src/lib/elementary/elm_slider_eo.h
new file mode 100644
index 0000000000..1f95ec1770
--- /dev/null
+++ b/src/lib/elementary/elm_slider_eo.h
@@ -0,0 +1,24 @@
1#ifndef _ELM_SLIDER_EO_H_
2#define _ELM_SLIDER_EO_H_
3
4#ifndef _ELM_SLIDER_EO_CLASS_TYPE
5#define _ELM_SLIDER_EO_CLASS_TYPE
6
7typedef Eo Elm_Slider;
8
9#endif
10
11#ifndef _ELM_SLIDER_EO_TYPES
12#define _ELM_SLIDER_EO_TYPES
13
14
15#endif
16/** Elementary slider class
17 *
18 * @ingroup Elm_Slider
19 */
20#define ELM_SLIDER_CLASS elm_slider_class_get()
21
22EWAPI const Efl_Class *elm_slider_class_get(void);
23
24#endif
diff --git a/src/lib/elementary/elm_slider_eo.legacy.h b/src/lib/elementary/elm_slider_eo.legacy.h
new file mode 100644
index 0000000000..cbca7aa864
--- /dev/null
+++ b/src/lib/elementary/elm_slider_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _ELM_SLIDER_EO_LEGACY_H_
2#define _ELM_SLIDER_EO_LEGACY_H_
3
4#ifndef _ELM_SLIDER_EO_CLASS_TYPE
5#define _ELM_SLIDER_EO_CLASS_TYPE
6
7typedef Eo Elm_Slider;
8
9#endif
10
11#ifndef _ELM_SLIDER_EO_TYPES
12#define _ELM_SLIDER_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/elementary/elm_slider_part_indicator.eo b/src/lib/elementary/elm_slider_part_indicator.eo
deleted file mode 100644
index d899d9d5fe..0000000000
--- a/src/lib/elementary/elm_slider_part_indicator.eo
+++ /dev/null
@@ -1,20 +0,0 @@
1import efl_ui;
2
3class Elm.Slider_Part_Indicator extends Efl.Ui.Layout_Part implements Efl.Ui.Format
4{
5 [[Elementary slider internal part class]]
6 data: null;
7 methods {
8 @property visible_mode {
9 [[Set/Get the visible mode of indicator.
10 ]]
11 values {
12 mode: Efl.Ui.Slider_Indicator_Visible_Mode; [[The indicator visible mode.]]
13 }
14 }
15 }
16 implements {
17 Efl.Ui.Format.format_cb { set; }
18 Efl.Ui.Format.format_string { set; get; }
19 }
20}
diff --git a/src/lib/elementary/elm_slider_part_indicator_eo.c b/src/lib/elementary/elm_slider_part_indicator_eo.c
new file mode 100644
index 0000000000..fd8372b07b
--- /dev/null
+++ b/src/lib/elementary/elm_slider_part_indicator_eo.c
@@ -0,0 +1,53 @@
1
2void _elm_slider_part_indicator_visible_mode_set(Eo *obj, void *pd, Efl_Ui_Slider_Indicator_Visible_Mode mode);
3
4EOAPI EFL_VOID_FUNC_BODYV(elm_slider_part_indicator_visible_mode_set, EFL_FUNC_CALL(mode), Efl_Ui_Slider_Indicator_Visible_Mode mode);
5
6Efl_Ui_Slider_Indicator_Visible_Mode _elm_slider_part_indicator_visible_mode_get(const Eo *obj, void *pd);
7
8EOAPI EFL_FUNC_BODY_CONST(elm_slider_part_indicator_visible_mode_get, Efl_Ui_Slider_Indicator_Visible_Mode, 0);
9
10void _elm_slider_part_indicator_efl_ui_format_format_cb_set(Eo *obj, void *pd, void *func_data, Efl_Ui_Format_Func_Cb func, Eina_Free_Cb func_free_cb);
11
12
13void _elm_slider_part_indicator_efl_ui_format_format_string_set(Eo *obj, void *pd, const char *units);
14
15
16const char *_elm_slider_part_indicator_efl_ui_format_format_string_get(const Eo *obj, void *pd);
17
18
19static Eina_Bool
20_elm_slider_part_indicator_class_initializer(Efl_Class *klass)
21{
22 const Efl_Object_Ops *opsp = NULL;
23
24 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
25
26#ifndef ELM_SLIDER_PART_INDICATOR_EXTRA_OPS
27#define ELM_SLIDER_PART_INDICATOR_EXTRA_OPS
28#endif
29
30 EFL_OPS_DEFINE(ops,
31 EFL_OBJECT_OP_FUNC(elm_slider_part_indicator_visible_mode_set, _elm_slider_part_indicator_visible_mode_set),
32 EFL_OBJECT_OP_FUNC(elm_slider_part_indicator_visible_mode_get, _elm_slider_part_indicator_visible_mode_get),
33 EFL_OBJECT_OP_FUNC(efl_ui_format_cb_set, _elm_slider_part_indicator_efl_ui_format_format_cb_set),
34 EFL_OBJECT_OP_FUNC(efl_ui_format_string_set, _elm_slider_part_indicator_efl_ui_format_format_string_set),
35 EFL_OBJECT_OP_FUNC(efl_ui_format_string_get, _elm_slider_part_indicator_efl_ui_format_format_string_get),
36 ELM_SLIDER_PART_INDICATOR_EXTRA_OPS
37 );
38 opsp = &ops;
39
40 return efl_class_functions_set(klass, opsp, ropsp);
41}
42
43static const Efl_Class_Description _elm_slider_part_indicator_class_desc = {
44 EO_VERSION,
45 "Elm.Slider_Part_Indicator",
46 EFL_CLASS_TYPE_REGULAR,
47 0,
48 _elm_slider_part_indicator_class_initializer,
49 NULL,
50 NULL
51};
52
53EFL_DEFINE_CLASS(elm_slider_part_indicator_class_get, &_elm_slider_part_indicator_class_desc, EFL_UI_LAYOUT_PART_CLASS, EFL_UI_FORMAT_MIXIN, NULL);
diff --git a/src/lib/elementary/elm_slider_part_indicator_eo.h b/src/lib/elementary/elm_slider_part_indicator_eo.h
new file mode 100644
index 0000000000..44e3bb04d0
--- /dev/null
+++ b/src/lib/elementary/elm_slider_part_indicator_eo.h
@@ -0,0 +1,45 @@
1#ifndef _ELM_SLIDER_PART_INDICATOR_EO_H_
2#define _ELM_SLIDER_PART_INDICATOR_EO_H_
3
4#ifndef _ELM_SLIDER_PART_INDICATOR_EO_CLASS_TYPE
5#define _ELM_SLIDER_PART_INDICATOR_EO_CLASS_TYPE
6
7typedef Eo Elm_Slider_Part_Indicator;
8
9#endif
10
11#ifndef _ELM_SLIDER_PART_INDICATOR_EO_TYPES
12#define _ELM_SLIDER_PART_INDICATOR_EO_TYPES
13
14
15#endif
16/** Elementary slider internal part class
17 *
18 * @ingroup Elm_Slider_Part_Indicator
19 */
20#define ELM_SLIDER_PART_INDICATOR_CLASS elm_slider_part_indicator_class_get()
21
22EWAPI const Efl_Class *elm_slider_part_indicator_class_get(void);
23
24/**
25 * @brief Set/Get the visible mode of indicator.
26 *
27 * @param[in] obj The object.
28 * @param[in] mode The indicator visible mode.
29 *
30 * @ingroup Elm_Slider_Part_Indicator
31 */
32EOAPI void elm_slider_part_indicator_visible_mode_set(Eo *obj, Efl_Ui_Slider_Indicator_Visible_Mode mode);
33
34/**
35 * @brief Set/Get the visible mode of indicator.
36 *
37 * @param[in] obj The object.
38 *
39 * @return The indicator visible mode.
40 *
41 * @ingroup Elm_Slider_Part_Indicator
42 */
43EOAPI Efl_Ui_Slider_Indicator_Visible_Mode elm_slider_part_indicator_visible_mode_get(const Eo *obj);
44
45#endif
diff --git a/src/lib/elementary/elm_slider_part_indicator_eo.legacy.h b/src/lib/elementary/elm_slider_part_indicator_eo.legacy.h
new file mode 100644
index 0000000000..a351cc4ab9
--- /dev/null
+++ b/src/lib/elementary/elm_slider_part_indicator_eo.legacy.h
@@ -0,0 +1,19 @@
1#ifndef _ELM_SLIDER_PART_INDICATOR_EO_LEGACY_H_
2#define _ELM_SLIDER_PART_INDICATOR_EO_LEGACY_H_
3
4#ifndef _ELM_SLIDER_PART_INDICATOR_EO_CLASS_TYPE
5#define _ELM_SLIDER_PART_INDICATOR_EO_CLASS_TYPE
6
7typedef Eo Elm_Slider_Part_Indicator;
8
9#endif
10
11#ifndef _ELM_SLIDER_PART_INDICATOR_EO_TYPES
12#define _ELM_SLIDER_PART_INDICATOR_EO_TYPES
13
14
15#endif
16
17
18
19#endif
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index c06e47a9fa..139941c062 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -139,8 +139,6 @@ pub_eo_files = [
139 'efl_ui_grid.eo', 139 'efl_ui_grid.eo',
140 'efl_ui_panes_part.eo', 140 'efl_ui_panes_part.eo',
141 'efl_ui_progressbar_part.eo', 141 'efl_ui_progressbar_part.eo',
142 'elm_slider.eo',
143 'elm_slider_part_indicator.eo',
144 'efl_ui_textpath_part.eo', 142 'efl_ui_textpath_part.eo',
145 'efl_ui_widget_part.eo', 143 'efl_ui_widget_part.eo',
146 'efl_ui_widget_part_bg.eo', 144 'efl_ui_widget_part_bg.eo',
@@ -791,6 +789,10 @@ elementary_pub_headers = [
791 'elm_segment_control_item_eo.legacy.h', 789 'elm_segment_control_item_eo.legacy.h',
792 'elm_separator_eo.h', 790 'elm_separator_eo.h',
793 'elm_separator_eo.legacy.h', 791 'elm_separator_eo.legacy.h',
792 'elm_slider_eo.h',
793 'elm_slider_eo.legacy.h',
794 'elm_slider_part_indicator_eo.h',
795 'elm_slider_part_indicator_eo.legacy.h',
794] 796]
795 797
796elementary_header_src = [ 798elementary_header_src = [