From 68c6df3ec75d4db1f6c3f29ad3894567278ba37c Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Tue, 31 Jul 2012 22:05:43 +0000 Subject: [PATCH] [elm] Hover now inheritable. SVN revision: 74678 --- legacy/elementary/src/lib/elm_hover.c | 82 +++------ legacy/elementary/src/lib/elm_widget_hover.h | 179 +++++++++++++++++++ 2 files changed, 204 insertions(+), 57 deletions(-) create mode 100644 legacy/elementary/src/lib/elm_widget_hover.h diff --git a/legacy/elementary/src/lib/elm_hover.c b/legacy/elementary/src/lib/elm_hover.c index 80221acb19..281d71cd8b 100644 --- a/legacy/elementary/src/lib/elm_hover.c +++ b/legacy/elementary/src/lib/elm_hover.c @@ -1,11 +1,8 @@ #include #include "elm_priv.h" -#include "elm_widget_layout.h" +#include "elm_widget_hover.h" -static const char HOVER_SMART_NAME[] = "elm_hover"; - -typedef struct _Elm_Hover_Smart_Data Elm_Hover_Smart_Data; -typedef struct _Content_Info Content_Info; +EAPI const char ELM_HOVER_SMART_NAME[] = "elm_hover"; #ifndef MAX # define MAX(a, b) (((a) > (b)) ? (a) : (b)) @@ -24,7 +21,7 @@ typedef struct _Content_Info Content_Info; #define _HOV_BOTTOM_LEFT (&(sd->subs[7])) #define _HOV_MIDDLE (&(sd->subs[8])) -static const Elm_Layout_Part_Alias_Description _content_aliases[] = +const Elm_Layout_Part_Alias_Description _content_aliases[] = { {"left", "elm.swallow.slot.left"}, {"top-left", "elm.swallow.slot.top-left"}, @@ -38,26 +35,6 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] = {NULL, NULL} }; -struct _Content_Info -{ - const char *swallow; - Evas_Object *obj; -}; - -struct _Elm_Hover_Smart_Data -{ - Elm_Layout_Smart_Data base; - - Evas_Object *offset, *size; - Evas_Object *parent, *target; - - Content_Info *smt_sub; /* 'smart placement' sub object */ - Content_Info subs[sizeof(_content_aliases) / - sizeof(_content_aliases[0]) - 1]; - - Eina_Bool on_del : 1; -}; - static const char SIG_CLICKED[] = "clicked"; static const char SIG_SMART_LOCATION_CHANGED[] = "smart,changed"; static const Evas_Smart_Cb_Description _smart_callbacks[] = { @@ -66,35 +43,8 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {NULL, NULL} }; -#define ELM_HOVER_DATA_GET(o, sd) \ - Elm_Hover_Smart_Data * sd = evas_object_smart_data_get(o) - -#define ELM_HOVER_DATA_GET_OR_RETURN(o, ptr) \ - ELM_HOVER_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return; \ - } - -#define ELM_HOVER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ - ELM_HOVER_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return val; \ - } - -#define ELM_HOVER_CHECK(obj) \ - if (!obj || !elm_widget_type_check((obj), HOVER_SMART_NAME, __func__)) \ - return - -/* Inheriting from elm_layout. Besides, we need no more than what is - * there */ EVAS_SMART_SUBCLASS_NEW - (HOVER_SMART_NAME, _elm_hover, Elm_Layout_Smart_Class, + (ELM_HOVER_SMART_NAME, _elm_hover, Elm_Hover_Smart_Class, Elm_Layout_Smart_Class, elm_layout_smart_class_get, _smart_callbacks); static void @@ -668,7 +618,7 @@ _elm_hover_smart_parent_set(Evas_Object *obj, } static void -_elm_hover_smart_set_user(Elm_Layout_Smart_Class *sc) +_elm_hover_smart_set_user(Elm_Hover_Smart_Class *sc) { ELM_WIDGET_CLASS(sc)->base.add = _elm_hover_smart_add; ELM_WIDGET_CLASS(sc)->base.del = _elm_hover_smart_del; @@ -690,9 +640,27 @@ _elm_hover_smart_set_user(Elm_Layout_Smart_Class *sc) ELM_CONTAINER_CLASS(sc)->content_get = _elm_hover_smart_content_get; ELM_CONTAINER_CLASS(sc)->content_unset = _elm_hover_smart_content_unset; - sc->sizing_eval = _elm_hover_smart_sizing_eval; + ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_hover_smart_sizing_eval; - sc->content_aliases = _content_aliases; + ELM_LAYOUT_CLASS(sc)->content_aliases = _content_aliases; +} + +EAPI const Elm_Hover_Smart_Class * +elm_hover_smart_class_get(void) +{ + static Elm_Hover_Smart_Class _sc = + ELM_HOVER_SMART_CLASS_INIT_NAME_VERSION(ELM_HOVER_SMART_NAME); + static const Elm_Hover_Smart_Class *class = NULL; + Evas_Smart_Class *esc = (Evas_Smart_Class *)&_sc; + + if (class) + return class; + + _elm_hover_smart_set(&_sc); + esc->callbacks = _smart_callbacks; + class = &_sc; + + return class; } EAPI Evas_Object * diff --git a/legacy/elementary/src/lib/elm_widget_hover.h b/legacy/elementary/src/lib/elm_widget_hover.h new file mode 100644 index 0000000000..a59af475f1 --- /dev/null +++ b/legacy/elementary/src/lib/elm_widget_hover.h @@ -0,0 +1,179 @@ +#ifndef ELM_WIDGET_HOVER_H +#define ELM_WIDGET_HOVER_H + +#include "elm_widget_layout.h" + +/** + * @addtogroup Widget + * @{ + * + * @section elm-hover-class The Elementary Hover Class + * + * Elementary, besides having the @ref Hover widget, exposes its + * foundation -- the Elementary Hover Class -- in order to create other + * widgets which are a hover with some more logic on top. + */ + +/** + * @def ELM_HOVER_CLASS + * + * Use this macro to cast whichever subclass of + * #Elm_Hover_Smart_Class into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_HOVER_CLASS(x) ((Elm_Hover_Smart_Class *)x) + +/** + * @def ELM_HOVER_DATA + * + * Use this macro to cast whichever subdata of + * #Elm_Hover_Smart_Data into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_HOVER_DATA(x) ((Elm_Hover_Smart_Data *)x) + +/** + * @def ELM_HOVER_SMART_CLASS_VERSION + * + * Current version for Elementary hover @b base smart class, a value + * which goes to _Elm_Hover_Smart_Class::version. + * + * @ingroup Widget + */ +#define ELM_HOVER_SMART_CLASS_VERSION 1 + +/** + * @def ELM_HOVER_SMART_CLASS_INIT + * + * Initializer for a whole #Elm_Hover_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_HOVER_SMART_CLASS_INIT_NULL + * @see ELM_HOVER_SMART_CLASS_INIT_NAME_VERSION + * + * @ingroup Widget + */ +#define ELM_HOVER_SMART_CLASS_INIT(smart_class_init) \ + {smart_class_init, ELM_HOVER_SMART_CLASS_VERSION} + +/** + * @def ELM_HOVER_SMART_CLASS_INIT_NULL + * + * Initializer to zero out a whole #Elm_Hover_Smart_Class structure. + * + * @see ELM_HOVER_SMART_CLASS_INIT_NAME_VERSION + * @see ELM_HOVER_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_HOVER_SMART_CLASS_INIT_NULL \ + ELM_HOVER_SMART_CLASS_INIT(EVAS_SMART_CLASS_INIT_NULL) + +/** + * @def ELM_HOVER_SMART_CLASS_INIT_NAME_VERSION + * + * Initializer to zero out a whole #Elm_Hover_Smart_Class structure and + * set its name and version. + * + * This is similar to #ELM_HOVER_SMART_CLASS_INIT_NULL, but it will + * also set the version field of #Elm_Hover_Smart_Class (base field) + * to the latest #ELM_HOVER_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_HOVER_SMART_CLASS_INIT_NULL + * @see ELM_HOVER_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_HOVER_SMART_CLASS_INIT_NAME_VERSION(name) \ + ELM_HOVER_SMART_CLASS_INIT \ + (ELM_LAYOUT_SMART_CLASS_INIT_NAME_VERSION(name)) + +/** + * Elementary hover base smart class. This inherits directly from + * #Elm_Layout_Smart_Class and is meant to build widgets extending the + * behavior of a hover. + * + * All of the functions listed on @ref Hover namespace will work for + * objects deriving from #Elm_Hover_Smart_Class. + */ +typedef struct _Elm_Hover_Smart_Class +{ + Elm_Layout_Smart_Class base; + + int version; /**< Version of this smart class definition */ +} Elm_Hover_Smart_Class; + +/** + * Base widget smart data extended with hover instance data. + */ +typedef struct _Elm_Hover_Smart_Data Elm_Hover_Smart_Data; +typedef struct _Content_Info Content_Info; + +struct _Content_Info +{ + const char *swallow; + Evas_Object *obj; +}; + +/* WARNING: sync size with actual declaration, always */ +extern const Elm_Layout_Part_Alias_Description _content_aliases[10]; + +struct _Elm_Hover_Smart_Data +{ + Elm_Layout_Smart_Data base; + + Evas_Object *offset, *size; + Evas_Object *parent, *target; + + Content_Info *smt_sub; /* 'smart placement' sub object */ + Content_Info subs[sizeof(_content_aliases) / + sizeof(_content_aliases[0]) - 1]; + + Eina_Bool on_del : 1; +}; + +/** + * @} + */ + +EAPI extern const char ELM_HOVER_SMART_NAME[]; +EAPI const Elm_Hover_Smart_Class *elm_hover_smart_class_get(void); + +#define ELM_HOVER_DATA_GET(o, sd) \ + Elm_Hover_Smart_Data * sd = evas_object_smart_data_get(o) + +#define ELM_HOVER_DATA_GET_OR_RETURN(o, ptr) \ + ELM_HOVER_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return; \ + } + +#define ELM_HOVER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_HOVER_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return val; \ + } + +#define ELM_HOVER_CHECK(obj) \ + if (!obj || !elm_widget_type_check((obj), ELM_HOVER_SMART_NAME, __func__)) \ + return + +#endif