Elm interface scrollable: Fix eo type errors.

This commit is contained in:
Tom Hacohen 2016-04-19 16:00:21 +01:00
parent bb4c14e9cc
commit dc05a18731
4 changed files with 48 additions and 38 deletions

View File

@ -1,3 +1,47 @@
import elm_general;
type Elm_Interface_Scrollable_Cb: __undefined_type;
type Elm_Interface_Scrollable_Resize_Cb: __undefined_type;
type Elm_Interface_Scrollable_Min_Limit_Cb: __undefined_type;
/* FIXME: Rename the namespace of the types. */
enum Elm.Scroller.Policy
{
[[Type that controls when scrollbars should appear.
See also @Elm.Interface_Scrollable.policy.set.
]]
auto = 0, [[Show scrollbars as needed]]
on, [[Always show scrollbars]]
off, [[Never show scrollbars]]
last
}
enum Elm.Scroller.Single_Direction
{
[[Type that controls how the content is scrolled.
See also @Elm.Interface_Scrollable.single_direction.set.
]]
none = 0, [[Scroll every direction]]
soft, [[Scroll single direction if the direction is certain]]
hard, [[Scroll only single direction]]
last
}
enum Elm.Scroller.Movement_Block
{
[[Type that blocks the scroll movement in one or more direction.
@since 1.8
]]
legacy: elm_scroller_movement;
no_block = 1 << 0, [[Do not block movements]]
block_vertical = 1 << 1, [[Block vertical movements]]
block_horizontal = 1 << 2 [[Block horizontal movements]]
}
mixin Elm.Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
{
legacy_prefix: null;

View File

@ -56,6 +56,9 @@ typedef void (*Elm_Interface_Scrollable_Resize_Cb)(Evas_Object *obj, Evas_C
typedef struct _Elm_Scrollable_Smart_Interface_Data
Elm_Scrollable_Smart_Interface_Data;
#include "elm_interface_scrollable.eo.h"
struct _Elm_Scrollable_Smart_Interface_Data
{
Evas_Coord x, y, w, h;
@ -232,8 +235,6 @@ struct _Elm_Scrollable_Smart_Interface_Data
return __VA_ARGS__; \
}
#include "elm_interface_scrollable.eo.h"
/**
* @}
*/

View File

@ -1,39 +1,3 @@
enum Elm.Scroller.Policy
{
[[Type that controls when scrollbars should appear.
See also @Elm.Interface_Scrollable.policy.set.
]]
auto = 0, [[Show scrollbars as needed]]
on, [[Always show scrollbars]]
off, [[Never show scrollbars]]
last
}
enum Elm.Scroller.Single_Direction
{
[[Type that controls how the content is scrolled.
See also @Elm.Interface_Scrollable.single_direction.set.
]]
none = 0, [[Scroll every direction]]
soft, [[Scroll single direction if the direction is certain]]
hard, [[Scroll only single direction]]
last
}
enum Elm.Scroller.Movement_Block
{
[[Type that blocks the scroll movement in one or more direction.
@since 1.8
]]
legacy: elm_scroller_movement;
no_block = 1 << 0, [[Do not block movements]]
block_vertical = 1 << 1, [[Block vertical movements]]
block_horizontal = 1 << 2 [[Block horizontal movements]]
}
class Elm.Scroller (Elm.Layout, Elm.Interface_Scrollable,
Elm.Interface_Atspi_Widget_Action,
Evas.Scrollable_Interface)

View File

@ -1,3 +1,4 @@
#include "elm_interface_scrollable.eo.legacy.h"
#include "elm_scroller.eo.legacy.h"
/**
* @brief Add a new scroller to the parent