summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2015-05-13 19:26:12 +0300
committerYakov Goldberg <yakov.g@samsung.com>2015-05-17 16:03:45 +0300
commit246e270c9fb1f3bd055562ce01b1a74e16d4c56d (patch)
tree29b14363717b34dd9005d3e3dc2ce569185a8b51
parentc9fc5b25d4c13c3f734607a34becdf37dce8308d (diff)
elm_scroller: Move enums to elm_scroller.eo
Move enums from elm_scroller_common.h to elm_scroller.eo in order to make them more accessible for bindings. Delete elm_scroller_common.h. Moved the include for elm_scroller.eo.legacy.h to the top of elm_scroller_legacy.h to allow the use of the generated types in the function declarations.
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/elm_interface_scrollable.eo4
-rw-r--r--src/lib/elm_scroller.eo44
-rw-r--r--src/lib/elm_scroller.h1
-rw-r--r--src/lib/elm_scroller_common.h49
-rw-r--r--src/lib/elm_scroller_legacy.h3
6 files changed, 47 insertions, 55 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a488e76ab..473570dad 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -337,7 +337,6 @@ elm_route_legacy.h \
337elm_scale.h \ 337elm_scale.h \
338elm_scroll.h \ 338elm_scroll.h \
339elm_scroller.h \ 339elm_scroller.h \
340elm_scroller_common.h \
341elm_scroller_eo.h \ 340elm_scroller_eo.h \
342elm_scroller_legacy.h \ 341elm_scroller_legacy.h \
343elm_segment_control.h \ 342elm_segment_control.h \
diff --git a/src/lib/elm_interface_scrollable.eo b/src/lib/elm_interface_scrollable.eo
index b52c32292..75fd51c5f 100644
--- a/src/lib/elm_interface_scrollable.eo
+++ b/src/lib/elm_interface_scrollable.eo
@@ -139,8 +139,8 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
139 get { 139 get {
140 } 140 }
141 values { 141 values {
142 Elm_Scroller_Policy hbar; /*@ Horizontal scrollbar policy */ 142 Elm.Scroller.Policy hbar; /*@ Horizontal scrollbar policy */
143 Elm_Scroller_Policy vbar; /*@ Vertical scrollbar policy */ 143 Elm.Scroller.Policy vbar; /*@ Vertical scrollbar policy */
144 } 144 }
145 } 145 }
146 @property content_region { 146 @property content_region {
diff --git a/src/lib/elm_scroller.eo b/src/lib/elm_scroller.eo
index da339ffa4..b128ce81d 100644
--- a/src/lib/elm_scroller.eo
+++ b/src/lib/elm_scroller.eo
@@ -1,3 +1,47 @@
1enum Elm.Scroller.Policy
2{
3 /*@
4 @brief Type that controls when scrollbars should appear.
5 @see elm_scroller_policy_set()
6
7 @ingroup Scroller
8 */
9 auto = 0, /*@< Show scrollbars as needed */
10 on, /*@< Always show scrollbars */
11 off, /*@< Never show scrollbars */
12 last
13}
14
15enum Elm.Scroller.Single_Direction
16{
17 /*@
18 @brief Type that controls how the content is scrolled.
19
20 @see elm_scroller_single_direction_set()
21 @ingroup Scroller
22 */
23 none = 0, /*@< Scroll every direction */
24 soft, /*@< Scroll single direction if the direction is certain*/
25 hard, /*@< Scroll only single direction */
26 last
27}
28
29enum Elm.Scroller.Movement_Block
30{
31 /*@
32 @brief Type that blocks the scroll movement in one or more direction.
33
34 @see elm_scroller_movement_block()
35
36 @since 1.8
37 @ingroup Scroller
38 */
39 legacy: elm_scroller_movement;
40 no_block = 1 << 0, /*@< Do not block movements */
41 block_vertical = 1 << 1, /*@< Block vertical movements */
42 block_horizontal = 1 << 2 /*@< Block horizontal movements */
43}
44
1class Elm.Scroller (Elm.Layout, Elm_Interface_Scrollable, 45class Elm.Scroller (Elm.Layout, Elm_Interface_Scrollable,
2 Elm_Interface_Atspi_Widget_Action) 46 Elm_Interface_Atspi_Widget_Action)
3{ 47{
diff --git a/src/lib/elm_scroller.h b/src/lib/elm_scroller.h
index 0c36c7415..0ab2445b4 100644
--- a/src/lib/elm_scroller.h
+++ b/src/lib/elm_scroller.h
@@ -64,7 +64,6 @@
64 * @{ 64 * @{
65 */ 65 */
66 66
67#include <elm_scroller_common.h>
68#ifdef EFL_EO_API_SUPPORT 67#ifdef EFL_EO_API_SUPPORT
69#include <elm_scroller_eo.h> 68#include <elm_scroller_eo.h>
70#endif 69#endif
diff --git a/src/lib/elm_scroller_common.h b/src/lib/elm_scroller_common.h
deleted file mode 100644
index 0df0bf745..000000000
--- a/src/lib/elm_scroller_common.h
+++ /dev/null
@@ -1,49 +0,0 @@
1/**
2 * @addtogroup Scroller
3 *
4 * @{
5 */
6
7/**
8 * @brief Type that controls when scrollbars should appear.
9 *
10 * @see elm_scroller_policy_set()
11 */
12typedef enum
13{
14 ELM_SCROLLER_POLICY_AUTO = 0, /**< Show scrollbars as needed */
15 ELM_SCROLLER_POLICY_ON, /**< Always show scrollbars */
16 ELM_SCROLLER_POLICY_OFF, /**< Never show scrollbars */
17 ELM_SCROLLER_POLICY_LAST
18} Elm_Scroller_Policy;
19
20/**
21 * @brief Type that controls how the content is scrolled.
22 *
23 * @see elm_scroller_single_direction_set()
24 */
25typedef enum
26{
27 ELM_SCROLLER_SINGLE_DIRECTION_NONE = 0, /**< Scroll every direction */
28 ELM_SCROLLER_SINGLE_DIRECTION_SOFT, /**< Scroll single direction if the direction is certain*/
29 ELM_SCROLLER_SINGLE_DIRECTION_HARD, /**< Scroll only single direction */
30 ELM_SCROLLER_SINGLE_DIRECTION_LAST
31} Elm_Scroller_Single_Direction;
32
33/**
34 * @brief Type that blocks the scroll movement in one or more direction.
35 *
36 * @see elm_scroller_movement_block()
37 *
38 * @since 1.8
39 */
40typedef enum
41{
42 ELM_SCROLLER_MOVEMENT_NO_BLOCK = 1 << 0, /**< Do not block movements */
43 ELM_SCROLLER_MOVEMENT_BLOCK_VERTICAL = 1 << 1, /**< Block vertical movements */
44 ELM_SCROLLER_MOVEMENT_BLOCK_HORIZONTAL = 1 << 2 /**< Block horizontal movements */
45} Elm_Scroller_Movement_Block;
46
47/**
48 * @}
49 */
diff --git a/src/lib/elm_scroller_legacy.h b/src/lib/elm_scroller_legacy.h
index 8d49b746c..bf4d361e1 100644
--- a/src/lib/elm_scroller_legacy.h
+++ b/src/lib/elm_scroller_legacy.h
@@ -1,3 +1,4 @@
1#include "elm_scroller.eo.legacy.h"
1/** 2/**
2 * @brief Add a new scroller to the parent 3 * @brief Add a new scroller to the parent
3 * 4 *
@@ -524,5 +525,3 @@ EAPI void elm_scroller_loop_set(Evas_Object *obj, Eina_
524 * @ingroup Scroller 525 * @ingroup Scroller
525 */ 526 */
526EAPI void elm_scroller_loop_get(const Evas_Object *obj, Eina_Bool *loop_h, Eina_Bool *loop_v); 527EAPI void elm_scroller_loop_get(const Evas_Object *obj, Eina_Bool *loop_h, Eina_Bool *loop_v);
527
528#include "elm_scroller.eo.legacy.h"