jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=dbd37a210f37826f4fb098122968411ffd46a185
commit dbd37a210f37826f4fb098122968411ffd46a185 Author: Daniel Zaoui <[email protected]> Date: Thu Mar 20 08:40:43 2014 +0200 Eolian: Integration of Button --- src/lib/Makefile.am | 10 +- src/lib/elm_button.c | 278 +++++++++++--------------------------------- src/lib/elm_button.eo | 112 ++++++++++++++++++ src/lib/elm_button_eo.h | 4 + src/lib/elm_widget_button.h | 6 +- 5 files changed, 193 insertions(+), 217 deletions(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 0cfbee1..1bb3282 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -561,7 +561,9 @@ BUILT_SOURCES = \ elm_box.eo.c \ elm_box.eo.h \ elm_bubble.eo.c \ - elm_bubble.eo.h + elm_bubble.eo.h \ + elm_button.eo.c \ + elm_button.eo.h EXTRA_DIST += \ elm_widget.eo \ @@ -582,7 +584,8 @@ EXTRA_DIST += \ elm_atspi_object.eo \ elm_bg.eo \ elm_box.eo \ - elm_bubble.eo + elm_bubble.eo \ + elm_button.eo nodist_includesunstable_HEADERS = \ elm_widget.eo.h \ @@ -603,5 +606,6 @@ nodist_includesunstable_HEADERS = \ elm_atspi_object.eo.h \ elm_box.eo.h \ elm_bg.eo.h \ - elm_bubble.eo.h + elm_bubble.eo.h \ + elm_button.eo.h diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index e688be1..b08626c 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -7,8 +7,6 @@ #include "elm_widget_button.h" #include "elm_widget_layout.h" -EAPI Eo_Op ELM_OBJ_BUTTON_BASE_ID = EO_NOOP; - #define MY_CLASS ELM_OBJ_BUTTON_CLASS #define MY_CLASS_NAME "Elm_Button" @@ -62,8 +60,8 @@ _activate(Evas_Object *obj) } } -static void -_elm_button_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_button_elm_layout_sizing_eval(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Evas_Coord minw = -1, minh = -1; @@ -75,21 +73,17 @@ _elm_button_smart_sizing_eval(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA evas_object_size_hint_min_set(obj, minw, minh); } -static void -_elm_button_smart_activate(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_button_elm_widget_activate(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Elm_Activate act) { - Elm_Activate act = va_arg(*list, Elm_Activate); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - - if (elm_widget_disabled_get(obj)) return; - if (act != ELM_ACTIVATE_DEFAULT) return; - if (evas_object_freeze_events_get(obj)) return; + if (elm_widget_disabled_get(obj)) return EINA_FALSE; + if (act != ELM_ACTIVATE_DEFAULT) return EINA_FALSE; + if (evas_object_freeze_events_get(obj)) return EINA_FALSE; evas_object_smart_callback_call(obj, SIG_CLICKED, NULL); elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); - if (ret) *ret = EINA_TRUE; + return EINA_TRUE; } /* FIXME: replicated from elm_layout just because button's icon spot @@ -111,84 +105,70 @@ _icon_signal_emit(Evas_Object *obj) /* FIXME: replicated from elm_layout just because button's icon spot * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * can changed the theme API */ -static void -_elm_button_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_button_elm_widget_theme_apply(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; eo_do_super(obj, MY_CLASS, elm_obj_widget_theme_apply(&int_ret)); - if (!int_ret) return; + if (!int_ret) return EINA_FALSE; _icon_signal_emit(obj); - if (ret) *ret = EINA_TRUE; + return EINA_TRUE; } /* FIXME: replicated from elm_layout just because button's icon spot * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * can changed the theme API */ -static void -_elm_button_smart_sub_object_del(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_button_elm_widget_sub_object_del(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Evas_Object *sobj) { - Evas_Object *sobj = va_arg(*list, Evas_Object *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; eo_do_super(obj, MY_CLASS, elm_obj_widget_sub_object_del(sobj, &int_ret)); - if (!int_ret) return; + if (!int_ret) return EINA_FALSE; _icon_signal_emit(obj); - if (ret) *ret = EINA_TRUE; + return EINA_TRUE; } /* FIXME: replicated from elm_layout just because button's icon spot * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * can changed the theme API */ -static void -_elm_button_smart_content_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_button_elm_container_content_set(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, const char *part, Evas_Object *content) { - const char *part = va_arg(*list, const char *); - Evas_Object *content = va_arg(*list, Evas_Object *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; Eina_Bool int_ret = EINA_FALSE; eo_do_super(obj, MY_CLASS, elm_obj_container_content_set(part, content, &int_ret)); - if (!int_ret) return; + if (!int_ret) return EINA_FALSE; _icon_signal_emit(obj); - if (ret) *ret = EINA_TRUE; + return EINA_TRUE; } -static void -_elm_button_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_button_elm_widget_event(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED, Evas_Object *src, Evas_Callback_Type type, void *event_info) { - Evas_Object *src = va_arg(*list, Evas_Object *); - Evas_Callback_Type type = va_arg(*list, Evas_Callback_Type); - Evas_Event_Key_Down *ev = va_arg(*list, void *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - - if (ret) *ret = EINA_FALSE; (void) src; + Evas_Event_Key_Down *ev = event_info; - if (elm_widget_disabled_get(obj)) return; - if (type != EVAS_CALLBACK_KEY_DOWN) return; - if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; + if (elm_widget_disabled_get(obj)) return EINA_FALSE; + if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; + if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE; if ((strcmp(ev->key, "Return")) && (strcmp(ev->key, "KP_Enter")) && (strcmp(ev->key, "space"))) - return; + return EINA_FALSE; elm_layout_signal_emit(obj, "elm,anim,activate", "elm"); _activate(obj); ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; - if (ret) *ret = EINA_TRUE; + return EINA_TRUE; } static void @@ -281,8 +261,8 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj) return NULL; } -static void -_elm_button_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_button_evas_smart_add(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) { ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -312,18 +292,16 @@ _elm_button_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) CRI("Failed to set layout!"); } -static void -_elm_button_smart_content_aliases_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static const Elm_Layout_Part_Alias_Description* +_elm_button_elm_layout_content_aliases_get(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) { - const Elm_Layout_Part_Alias_Description **aliases = va_arg(*list, const Elm_Layout_Part_Alias_Description **); - *aliases = _content_aliases; + return _content_aliases; } -static void -_elm_button_smart_text_aliases_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static const Elm_Layout_Part_Alias_Description* +_elm_button_elm_layout_text_aliases_get(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) { - const Elm_Layout_Part_Alias_Description **aliases = va_arg(*list, const Elm_Layout_Part_Alias_Description **); - *aliases = _text_aliases; + return _text_aliases; } EAPI Evas_Object * @@ -335,8 +313,8 @@ elm_button_add(Evas_Object *parent) return obj; } -static void -_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) +EOLIAN static void +_elm_button_eo_base_constructor(Eo *obj, Elm_Button_Data *_pd EINA_UNUSED) { eo_do_super(obj, MY_CLASS, eo_constructor()); eo_do(obj, @@ -344,74 +322,40 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); } -EAPI void -elm_button_autorepeat_set(Evas_Object *obj, - Eina_Bool on) +EOLIAN static void +_elm_button_autorepeat_set(Eo *obj EINA_UNUSED, Elm_Button_Data *sd, Eina_Bool on) { - ELM_BUTTON_CHECK(obj); - eo_do(obj, elm_obj_button_autorepeat_set(on)); -} - -static void -_autorepeat_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) -{ - Eina_Bool on = va_arg(*list, int); - Elm_Button_Smart_Data *sd = _pd; - ELM_SAFE_FREE(sd->timer, ecore_timer_del); sd->autorepeat = on; sd->repeating = EINA_FALSE; } #define _AR_CAPABLE(obj) \ - (_elm_button_admits_autorepeat_get(obj)) + (_internal_elm_button_admits_autorepeat_get(obj)) static Eina_Bool -_elm_button_admits_autorepeat_get(const Evas_Object *obj) +_internal_elm_button_admits_autorepeat_get(const Evas_Object *obj) { Eina_Bool ret = EINA_FALSE; eo_do((Eo *) obj, elm_obj_button_admits_autorepeat_get(&ret)); return ret; } -static void -_admits_autorepeat_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) -{ - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_TRUE; -} - -EAPI Eina_Bool -elm_button_autorepeat_get(const Evas_Object *obj) -{ - ELM_BUTTON_CHECK(obj) EINA_FALSE; - Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_obj_button_autorepeat_get(&ret)); - return ret; -} - -static void -_autorepeat_get(Eo *obj, void *_pd, va_list *list) +EOLIAN static Eina_Bool +_elm_button_admits_autorepeat_get(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Button_Smart_Data *sd = _pd; - *ret = _AR_CAPABLE(obj) & sd->autorepeat; + return EINA_TRUE; } -EAPI void -elm_button_autorepeat_initial_timeout_set(Evas_Object *obj, - double t) +EOLIAN static Eina_Bool +_elm_button_autorepeat_get(Eo *obj, Elm_Button_Data *sd) { - ELM_BUTTON_CHECK(obj); - eo_do(obj, elm_obj_button_autorepeat_initial_timeout_set(t)); + return (_AR_CAPABLE(obj) & sd->autorepeat); } -static void -_autorepeat_initial_timeout_set(Eo *obj, void *_pd, va_list *list) +EOLIAN static void +_elm_button_autorepeat_initial_timeout_set(Eo *obj, Elm_Button_Data *sd, double t) { - double t = va_arg(*list, double); - Elm_Button_Smart_Data *sd = _pd; - if (!_AR_CAPABLE(obj)) { ERR("this widget does not support auto repetition of clicks."); @@ -423,41 +367,18 @@ _autorepeat_initial_timeout_set(Eo *obj, void *_pd, va_list *list) sd->ar_threshold = t; } -EAPI double -elm_button_autorepeat_initial_timeout_get(const Evas_Object *obj) -{ - ELM_BUTTON_CHECK(obj) 0.0; - double ret = 0.0; - eo_do((Eo *) obj, elm_obj_button_autorepeat_initial_timeout_get(&ret)); - return ret; -} - -static void -_autorepeat_initial_timeout_get(Eo *obj, void *_pd, va_list *list) +EOLIAN static double +_elm_button_autorepeat_initial_timeout_get(Eo *obj, Elm_Button_Data *sd) { - double *ret = va_arg(*list, double *); - Elm_Button_Smart_Data *sd = _pd; - if (!_AR_CAPABLE(obj)) - *ret = 0.0; + return 0.0; else - *ret = sd->ar_threshold; + return sd->ar_threshold; } -EAPI void -elm_button_autorepeat_gap_timeout_set(Evas_Object *obj, - double t) +EOLIAN static void +_elm_button_autorepeat_gap_timeout_set(Eo *obj, Elm_Button_Data *sd, double t) { - ELM_BUTTON_CHECK(obj); - eo_do(obj, elm_obj_button_autorepeat_gap_timeout_set(t)); -} - -static void -_autorepeat_gap_timeout_set(Eo *obj, void *_pd, va_list *list) -{ - double t = va_arg(*list, double); - Elm_Button_Smart_Data *sd = _pd; - if (!_AR_CAPABLE(obj)) { ERR("this widget does not support auto repetition of clicks."); @@ -470,93 +391,28 @@ _autorepeat_gap_timeout_set(Eo *obj, void *_pd, va_list *list) if ((sd->repeating) && (sd->timer)) ecore_timer_interval_set(sd->timer, t); } -EAPI double -elm_button_autorepeat_gap_timeout_get(const Evas_Object *obj) +EOLIAN static double +_elm_button_autorepeat_gap_timeout_get(Eo *obj EINA_UNUSED, Elm_Button_Data *sd) { - ELM_BUTTON_CHECK(obj) 0.0; - double ret = 0.0; - eo_do((Eo *) obj, elm_obj_button_autorepeat_gap_timeout_get(&ret)); - return ret; + return sd->ar_interval; } -static void -_autorepeat_gap_timeout_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) +EOLIAN static Eina_Bool +_elm_button_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) { - double *ret = va_arg(*list, double *); - Elm_Button_Smart_Data *sd = _pd; - - *ret = sd->ar_interval; + return EINA_FALSE; } -static void -_elm_button_smart_focus_next_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +EOLIAN static Eina_Bool +_elm_button_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Button_Data *_pd EINA_UNUSED) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; + return EINA_FALSE; } static void -_elm_button_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) +_elm_button_class_constructor(Eo_Class *klass) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - *ret = EINA_FALSE; -} - -static void -_class_constructor(Eo_Class *klass) -{ - const Eo_Op_Func_Description func_desc[] = { - EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), - - EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_button_smart_add), - - EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_THEME_APPLY), _elm_button_smart_theme), - EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_EVENT), _elm_button_smart_event), - EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_SUB_OBJECT_DEL), _elm_button_smart_sub_object_del), - EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_ACTIVATE), _elm_button_smart_activate), - EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_NEXT_MANAGER_IS), _elm_button_smart_focus_next_manager_is), - EO_OP_FUNC(ELM_OBJ_WIDGET_ID(ELM_OBJ_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_button_smart_focus_direction_manager_is), - - EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_button_smart_content_set), - - EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_button_smart_sizing_eval), - EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_CONTENT_ALIASES_GET), _elm_button_smart_content_aliases_get), - EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_TEXT_ALIASES_GET), _elm_button_smart_text_aliases_get), - - EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_ADMITS_AUTOREPEAT_GET), _admits_autorepeat_get), - EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_SET), _autorepeat_set), - EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GET), _autorepeat_get), - EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_INITIAL_TIMEOUT_SET), _autorepeat_initial_timeout_set), - EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_INITIAL_TIMEOUT_GET), _autorepeat_initial_timeout_get), - EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GAP_TIMEOUT_SET), _autorepeat_gap_timeout_set), - EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GAP_TIMEOUT_GET), _autorepeat_gap_timeout_get), - EO_OP_FUNC_SENTINEL - }; - eo_class_funcs_set(klass, func_desc); - evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); } -static const Eo_Op_Description op_desc[] = { - EO_OP_DESCRIPTION(ELM_OBJ_BUTTON_SUB_ID_ADMITS_AUTOREPEAT_GET, "Get whether auto-repetition is implemented or not"), - EO_OP_DESCRIPTION(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_SET, "Turn on/off the autorepeat event generated when the button is kept pressed."), - EO_OP_DESCRIPTION(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GET, "Get whether the autorepeat feature is enabled."), - EO_OP_DESCRIPTION(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_INITIAL_TIMEOUT_SET, "Set the initial timeout before the autorepeat event is generated."), - EO_OP_DESCRIPTION(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_INITIAL_TIMEOUT_GET, "Get the initial timeout before the autorepeat event is generated."), - EO_OP_DESCRIPTION(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GAP_TIMEOUT_SET, "Set the interval between each generated autorepeat event."), - EO_OP_DESCRIPTION(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GAP_TIMEOUT_GET, "Get the interval between each generated autorepeat event."), - EO_OP_DESCRIPTION_SENTINEL -}; - -static const Eo_Class_Description class_desc = { - EO_VERSION, - MY_CLASS_NAME, - EO_CLASS_TYPE_REGULAR, - EO_CLASS_DESCRIPTION_OPS(&ELM_OBJ_BUTTON_BASE_ID, op_desc, ELM_OBJ_BUTTON_SUB_ID_LAST), - NULL, - sizeof(Elm_Button_Smart_Data), - _class_constructor, - NULL -}; - -EO_DEFINE_CLASS(elm_obj_button_class_get, &class_desc, ELM_OBJ_LAYOUT_CLASS, EVAS_SMART_CLICKABLE_INTERFACE, NULL); +#include "elm_button.eo.c" diff --git a/src/lib/elm_button.eo b/src/lib/elm_button.eo new file mode 100644 index 0000000..27df63d --- /dev/null +++ b/src/lib/elm_button.eo @@ -0,0 +1,112 @@ +class Elm_Button (Elm_Layout, Evas_Clickable_Interface) +{ + eo_prefix: elm_obj_button; + properties { + autorepeat_initial_timeout { + set { + /*@ + Set the initial timeout before the autorepeat event is generated + + Sets the timeout, in seconds, since the button is pressed until the + first @c repeated signal is emitted. If @p t is 0.0 or less, there + won't be any delay and the event will be fired the moment the button is + pressed. + + @see elm_button_autorepeat_set() + @see elm_button_autorepeat_gap_timeout_set() + + @ingroup Button */ + } + get { + /*@ + Get the initial timeout before the autorepeat event is generated + + @return Timeout in seconds + + @see elm_button_autorepeat_initial_timeout_set() + + @ingroup Button */ + } + values { + double t; /*@ Timeout in seconds */ + } + } + autorepeat_gap_timeout { + set { + /*@ + Set the interval between each generated autorepeat event + + After the first @c repeated event is fired, all subsequent ones will + follow after a delay of @p t seconds for each. + + @see elm_button_autorepeat_initial_timeout_set() + + @ingroup Button */ + } + get { + /*@ + Get the interval between each generated autorepeat event + + @return Interval in seconds + + @ingroup Button */ + } + values { + double t; /*@ Interval in seconds */ + } + } + autorepeat { + set { + /*@ + Turn on/off the autorepeat event generated when the button is kept pressed + + When off, no autorepeat is performed and buttons emit a normal @c clicked + signal when they are clicked. + + When on, keeping a button pressed will continuously emit a @c repeated + signal until the button is released. The time it takes until it starts + emitting the signal is given by + elm_button_autorepeat_initial_timeout_set(), and the time between each + new emission by elm_button_autorepeat_gap_timeout_set(). + + @ingroup Button */ + } + get { + /*@ + Get whether the autorepeat feature is enabled + + @return @c EINA_TRUE if autorepeat is on, @c EINA_FALSE otherwise + + @see elm_button_autorepeat_set() + + @ingroup Button */ + } + values { + Eina_Bool on; /*@ A bool to turn on/off the event */ + } + } + admits_autorepeat { + get { + /*@ No description supplied by the EAPI. */ + } + values { + Eina_Bool ret; + } + } + } + implements { + class::constructor; + Eo_Base::constructor; + Evas_Smart::add; + Elm_Widget::activate; + Elm_Widget::focus_next_manager_is; + Elm_Widget::focus_direction_manager_is; + Elm_Widget::theme_apply; + Elm_Widget::sub_object_del; + Elm_Widget::event; + Elm_Container::content_set; + Elm_Layout::text_aliases::get; + Elm_Layout::content_aliases::get; + Elm_Layout::sizing_eval; + } +} diff --git a/src/lib/elm_button_eo.h b/src/lib/elm_button_eo.h index 341750a..d976998 100644 --- a/src/lib/elm_button_eo.h +++ b/src/lib/elm_button_eo.h @@ -1,3 +1,6 @@ +#include "elm_button.eo.h" + +#if 0 #define ELM_OBJ_BUTTON_CLASS elm_obj_button_class_get() const Eo_Class *elm_obj_button_class_get(void) EINA_CONST; @@ -116,3 +119,4 @@ enum * @ingroup Button */ #define elm_obj_button_autorepeat_gap_timeout_get(ret) ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_AUTOREPEAT_GAP_TIMEOUT_GET), EO_TYPECHECK(double *, ret) +#endif diff --git a/src/lib/elm_widget_button.h b/src/lib/elm_widget_button.h index 0e4a1fb..1a121b3 100644 --- a/src/lib/elm_widget_button.h +++ b/src/lib/elm_widget_button.h @@ -18,7 +18,7 @@ /** * Base widget smart data extended with button instance data. */ -typedef struct _Elm_Button_Smart_Data +typedef struct _Elm_Button_Data { /* auto-repeat stuff */ double ar_threshold; /**< Time to wait until first auto-repeated click is generated */ @@ -28,14 +28,14 @@ typedef struct _Elm_Button_Smart_Data Eina_Bool autorepeat : 1; /**< Whether auto-repetition of clicks is enabled or not (bound to _Elm_Button_Smart_Class::admits_autorepeat) */ Eina_Bool repeating : 1; /**< Whether auto-repetition is going on */ -} Elm_Button_Smart_Data; +} Elm_Button_Data; /** * @} */ #define ELM_BUTTON_DATA_GET(o, sd) \ - Elm_Button_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_BUTTON_CLASS) + Elm_Button_Data * sd = eo_data_scope_get(o, ELM_OBJ_BUTTON_CLASS) #define ELM_BUTTON_DATA_GET_OR_RETURN(o, ptr) \ ELM_BUTTON_DATA_GET(o, ptr); \ --
