From ccc06c6c537ff46201d1e812d105b813015e1762 Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Tue, 31 Jul 2012 22:06:16 +0000 Subject: [PATCH] [elm] Actionslider now inheritable. SVN revision: 74684 --- legacy/elementary/src/lib/Makefile.am | 1 + legacy/elementary/src/lib/elm_actionslider.c | 80 +++------ .../src/lib/elm_widget_actionslider.h | 167 ++++++++++++++++++ 3 files changed, 197 insertions(+), 51 deletions(-) create mode 100644 legacy/elementary/src/lib/elm_widget_actionslider.h diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index 71666b9a75..ad5d0bf2cd 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/src/lib/Makefile.am @@ -43,6 +43,7 @@ includesdir = $(includedir)/elementary-@VMAJ@ includesunstable_HEADERS = \ elm_interface_scrollable.h \ elm_widget.h \ +elm_widget_actionslider.h \ elm_widget_box.h \ elm_widget_button.h \ elm_widget_container.h \ diff --git a/legacy/elementary/src/lib/elm_actionslider.c b/legacy/elementary/src/lib/elm_actionslider.c index c916f21bff..4ca30d585a 100644 --- a/legacy/elementary/src/lib/elm_actionslider.c +++ b/legacy/elementary/src/lib/elm_actionslider.c @@ -1,23 +1,9 @@ #include #include #include "elm_priv.h" -#include "elm_widget_layout.h" +#include "elm_widget_actionslider.h" -static const char ACTIONSLIDER_SMART_NAME[] = "elm_actionslider"; - -typedef struct _Elm_Actionslider_Smart_Data Elm_Actionslider_Smart_Data; - -struct _Elm_Actionslider_Smart_Data -{ - Elm_Layout_Smart_Data base; - - Evas_Object *drag_button_base; - Elm_Actionslider_Pos magnet_position, enabled_position; - Ecore_Animator *button_animator; - double final_position; - - Eina_Bool mouse_down : 1; -}; +EAPI const char ELM_ACTIONSLIDER_SMART_NAME[] = "elm_actionslider"; static const Elm_Layout_Part_Alias_Description _text_aliases[] = { @@ -37,37 +23,10 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {NULL, NULL} }; -#define ELM_ACTIONSLIDER_DATA_GET(o, sd) \ - Elm_Actionslider_Smart_Data * sd = evas_object_smart_data_get(o) - -#define ELM_ACTIONSLIDER_DATA_GET_OR_RETURN(o, ptr) \ - ELM_ACTIONSLIDER_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return; \ - } - -#define ELM_ACTIONSLIDER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ - ELM_ACTIONSLIDER_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return val; \ - } - -#define ELM_ACTIONSLIDER_CHECK(obj) \ - if (!obj || !elm_widget_type_check((obj), ACTIONSLIDER_SMART_NAME, \ - __func__)) \ - return - -/* Inheriting from elm_layout. Besides, we need no more than what is - * there */ EVAS_SMART_SUBCLASS_NEW - (ACTIONSLIDER_SMART_NAME, _elm_actionslider, Elm_Layout_Smart_Class, - Elm_Layout_Smart_Class, elm_layout_smart_class_get, _smart_callbacks); + (ELM_ACTIONSLIDER_SMART_NAME, _elm_actionslider, + Elm_Actionslider_Smart_Class, Elm_Layout_Smart_Class, + elm_layout_smart_class_get, _smart_callbacks); static Elm_Actionslider_Pos _get_pos_by_orientation(const Evas_Object *obj, @@ -444,7 +403,7 @@ _elm_actionslider_smart_add(Evas_Object *obj) } static void -_elm_actionslider_smart_set_user(Elm_Layout_Smart_Class *sc) +_elm_actionslider_smart_set_user(Elm_Actionslider_Smart_Class *sc) { ELM_WIDGET_CLASS(sc)->base.add = _elm_actionslider_smart_add; @@ -454,11 +413,30 @@ _elm_actionslider_smart_set_user(Elm_Layout_Smart_Class *sc) ELM_WIDGET_CLASS(sc)->theme = _elm_actionslider_smart_theme; - sc->sizing_eval = _elm_actionslider_smart_sizing_eval; - sc->text_set = _elm_actionslider_smart_text_set; - sc->text_get = _elm_actionslider_smart_text_get; + ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_actionslider_smart_sizing_eval; + ELM_LAYOUT_CLASS(sc)->text_set = _elm_actionslider_smart_text_set; + ELM_LAYOUT_CLASS(sc)->text_get = _elm_actionslider_smart_text_get; - sc->text_aliases = _text_aliases; + ELM_LAYOUT_CLASS(sc)->text_aliases = _text_aliases; +} + +EAPI const Elm_Actionslider_Smart_Class * +elm_actionslider_smart_class_get(void) +{ + static Elm_Actionslider_Smart_Class _sc = + ELM_ACTIONSLIDER_SMART_CLASS_INIT_NAME_VERSION + (ELM_ACTIONSLIDER_SMART_NAME); + static const Elm_Actionslider_Smart_Class *class = NULL; + Evas_Smart_Class *esc = (Evas_Smart_Class *)&_sc; + + if (class) + return class; + + _elm_actionslider_smart_set(&_sc); + esc->callbacks = _smart_callbacks; + class = &_sc; + + return class; } EAPI Evas_Object * diff --git a/legacy/elementary/src/lib/elm_widget_actionslider.h b/legacy/elementary/src/lib/elm_widget_actionslider.h new file mode 100644 index 0000000000..0eb29600b5 --- /dev/null +++ b/legacy/elementary/src/lib/elm_widget_actionslider.h @@ -0,0 +1,167 @@ +#ifndef ELM_WIDGET_ACTIONSLIDER_H +#define ELM_WIDGET_ACTIONSLIDER_H + +#include "elm_widget_layout.h" + +/** + * @addtogroup Widget + * @{ + * + * @section elm-actionslider-class The Elementary Actionslider Class + * + * Elementary, besides having the @ref Actionslider widget, exposes its + * foundation -- the Elementary Actionslider Class -- in order to create other + * widgets which are a actionslider with some more logic on top. + */ + +/** + * @def ELM_ACTIONSLIDER_CLASS + * + * Use this macro to cast whichever subclass of + * #Elm_Actionslider_Smart_Class into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_ACTIONSLIDER_CLASS(x) ((Elm_Actionslider_Smart_Class *)x) + +/** + * @def ELM_ACTIONSLIDER_DATA + * + * Use this macro to cast whichever subdata of + * #Elm_Actionslider_Smart_Data into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_ACTIONSLIDER_DATA(x) ((Elm_Actionslider_Smart_Data *)x) + +/** + * @def ELM_ACTIONSLIDER_SMART_CLASS_VERSION + * + * Current version for Elementary actionslider @b base smart class, a value + * which goes to _Elm_Actionslider_Smart_Class::version. + * + * @ingroup Widget + */ +#define ELM_ACTIONSLIDER_SMART_CLASS_VERSION 1 + +/** + * @def ELM_ACTIONSLIDER_SMART_CLASS_INIT + * + * Initializer for a whole #Elm_Actionslider_Smart_Class structure, with + * @c NULL values on its specific fields. + * + * @param smart_class_init initializer to use for the "base" field + * (#Evas_Smart_Class). + * + * @see EVAS_SMART_CLASS_INIT_NULL + * @see EVAS_SMART_CLASS_INIT_NAME_VERSION + * @see ELM_ACTIONSLIDER_SMART_CLASS_INIT_NULL + * @see ELM_ACTIONSLIDER_SMART_CLASS_INIT_NAME_VERSION + * + * @ingroup Widget + */ +#define ELM_ACTIONSLIDER_SMART_CLASS_INIT(smart_class_init) \ + {smart_class_init, ELM_ACTIONSLIDER_SMART_CLASS_VERSION} + +/** + * @def ELM_ACTIONSLIDER_SMART_CLASS_INIT_NULL + * + * Initializer to zero out a whole #Elm_Actionslider_Smart_Class structure. + * + * @see ELM_ACTIONSLIDER_SMART_CLASS_INIT_NAME_VERSION + * @see ELM_ACTIONSLIDER_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_ACTIONSLIDER_SMART_CLASS_INIT_NULL \ + ELM_ACTIONSLIDER_SMART_CLASS_INIT(EVAS_SMART_CLASS_INIT_NULL) + +/** + * @def ELM_ACTIONSLIDER_SMART_CLASS_INIT_NAME_VERSION + * + * Initializer to zero out a whole #Elm_Actionslider_Smart_Class structure and + * set its name and version. + * + * This is similar to #ELM_ACTIONSLIDER_SMART_CLASS_INIT_NULL, but it will + * also set the version field of #Elm_Actionslider_Smart_Class (base field) + * to the latest #ELM_ACTIONSLIDER_SMART_CLASS_VERSION and name it to the + * specific value. + * + * It will keep a reference to the name field as a "const char *", + * i.e., the name must be available while the structure is + * used (hint: static or global variable!) and must not be modified. + * + * @see ELM_ACTIONSLIDER_SMART_CLASS_INIT_NULL + * @see ELM_ACTIONSLIDER_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_ACTIONSLIDER_SMART_CLASS_INIT_NAME_VERSION(name) \ + ELM_ACTIONSLIDER_SMART_CLASS_INIT \ + (ELM_LAYOUT_SMART_CLASS_INIT_NAME_VERSION(name)) + +/** + * Elementary actionslider base smart class. This inherits directly from + * #Elm_Layout_Smart_Class and is meant to build widgets extending the + * behavior of a actionslider. + * + * All of the functions listed on @ref Actionslider namespace will work for + * objects deriving from #Elm_Actionslider_Smart_Class. + */ +typedef struct _Elm_Actionslider_Smart_Class +{ + Elm_Layout_Smart_Class base; + + int version; /**< Version of this smart class definition */ +} Elm_Actionslider_Smart_Class; + +/** + * Base layout smart data extended with actionslider instance data. + */ +typedef struct _Elm_Actionslider_Smart_Data Elm_Actionslider_Smart_Data; +struct _Elm_Actionslider_Smart_Data +{ + Elm_Layout_Smart_Data base; + + Evas_Object *drag_button_base; + Elm_Actionslider_Pos magnet_position, enabled_position; + Ecore_Animator *button_animator; + double final_position; + + Eina_Bool mouse_down : 1; +}; + +/** + * @} + */ + +EAPI extern const char ELM_ACTIONSLIDER_SMART_NAME[]; +EAPI const Elm_Actionslider_Smart_Class *elm_actionslider_smart_class_get(void); + +#define ELM_ACTIONSLIDER_DATA_GET(o, sd) \ + Elm_Actionslider_Smart_Data * sd = evas_object_smart_data_get(o) + +#define ELM_ACTIONSLIDER_DATA_GET_OR_RETURN(o, ptr) \ + ELM_ACTIONSLIDER_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return; \ + } + +#define ELM_ACTIONSLIDER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_ACTIONSLIDER_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return val; \ + } + +#define ELM_ACTIONSLIDER_CHECK(obj) \ + if (!obj || !elm_widget_type_check \ + ((obj), ELM_ACTIONSLIDER_SMART_NAME, __func__)) \ + return + +#endif