diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index b2768b53f3..a058d8afb6 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/src/lib/Makefile.am @@ -62,6 +62,7 @@ elm_widget_genlist.h \ elm_widget_glview.h \ elm_widget_grid.h \ elm_widget_hover.h \ +elm_widget_hoversel.h \ elm_widget_icon.h \ elm_widget_image.h \ elm_widget_index.h \ diff --git a/legacy/elementary/src/lib/elc_hoversel.c b/legacy/elementary/src/lib/elc_hoversel.c index 0454b36d59..7376c4e09d 100644 --- a/legacy/elementary/src/lib/elc_hoversel.c +++ b/legacy/elementary/src/lib/elc_hoversel.c @@ -1,70 +1,8 @@ #include #include "elm_priv.h" -#include "elm_widget_button.h" +#include "elm_widget_hoversel.h" -static const char HOVERSEL_SMART_NAME[] = "elm_hoversel"; - -typedef struct _Elm_Hoversel_Smart_Data Elm_Hoversel_Smart_Data; -typedef struct _Elm_Hoversel_Item Elm_Hoversel_Item; - -struct _Elm_Hoversel_Smart_Data -{ - Elm_Button_Smart_Data base; - - /* aggregates a hover */ - Evas_Object *hover; - Evas_Object *hover_parent; - - Eina_List *items; - - Eina_Bool horizontal : 1; - Eina_Bool expanded : 1; -}; - -struct _Elm_Hoversel_Item -{ - ELM_WIDGET_ITEM; - - const char *label; - const char *icon_file; - const char *icon_group; - - Elm_Icon_Type icon_type; - Evas_Smart_Cb func; -}; - -#define ELM_HOVERSEL_DATA_GET(o, sd) \ - Elm_Hoversel_Smart_Data * sd = evas_object_smart_data_get(o) - -#define ELM_HOVERSEL_DATA_GET_OR_RETURN(o, ptr) \ - ELM_HOVERSEL_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return; \ - } - -#define ELM_HOVERSEL_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ - ELM_HOVERSEL_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return val; \ - } - -#define ELM_HOVERSEL_CHECK(obj) \ - if (!obj || !elm_widget_type_check((obj), HOVERSEL_SMART_NAME, __func__)) \ - return - -#define ELM_HOVERSEL_ITEM_CHECK(it) \ - ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)it, ); \ - ELM_HOVERSEL_CHECK(it->base.widget); - -#define ELM_HOVERSEL_ITEM_CHECK_OR_RETURN(it, ...) \ - ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)it, __VA_ARGS__); \ - ELM_HOVERSEL_CHECK(it->base.widget) __VA_ARGS__; +EAPI const char ELM_HOVERSEL_SMART_NAME[] = "elm_hoversel"; static const char SIG_SELECTED[] = "selected"; static const char SIG_DISMISSED[] = "dismissed"; @@ -75,7 +13,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { }; EVAS_SMART_SUBCLASS_NEW - (HOVERSEL_SMART_NAME, _elm_hoversel, Elm_Button_Smart_Class, + (ELM_HOVERSEL_SMART_NAME, _elm_hoversel, Elm_Hoversel_Smart_Class, Elm_Button_Smart_Class, elm_button_smart_class_get, _smart_callbacks); static Eina_Bool @@ -300,7 +238,7 @@ _elm_hoversel_smart_parent_set(Evas_Object *obj, } static void -_elm_hoversel_smart_set_user(Elm_Button_Smart_Class *sc) +_elm_hoversel_smart_set_user(Elm_Hoversel_Smart_Class *sc) { ELM_WIDGET_CLASS(sc)->base.add = _elm_hoversel_smart_add; ELM_WIDGET_CLASS(sc)->base.del = _elm_hoversel_smart_del; @@ -308,7 +246,24 @@ _elm_hoversel_smart_set_user(Elm_Button_Smart_Class *sc) ELM_WIDGET_CLASS(sc)->parent_set = _elm_hoversel_smart_parent_set; ELM_WIDGET_CLASS(sc)->theme = _elm_hoversel_smart_theme; - sc->admits_autorepeat = EINA_FALSE; + ELM_BUTTON_CLASS(sc)->admits_autorepeat = EINA_FALSE; +} + +EAPI const Elm_Hoversel_Smart_Class * +elm_hoversel_smart_class_get(void) +{ + static Elm_Hoversel_Smart_Class _sc = + ELM_HOVERSEL_SMART_CLASS_INIT_NAME_VERSION(ELM_HOVERSEL_SMART_NAME); + static const Elm_Hoversel_Smart_Class *class = NULL; + Evas_Smart_Class *esc = (Evas_Smart_Class *)&_sc; + + if (class) return class; + + _elm_hoversel_smart_set(&_sc); + esc->callbacks = _smart_callbacks; + class = &_sc; + + return class; } EAPI Evas_Object * diff --git a/legacy/elementary/src/lib/elm_widget_hoversel.h b/legacy/elementary/src/lib/elm_widget_hoversel.h new file mode 100644 index 0000000000..9f7b91952b --- /dev/null +++ b/legacy/elementary/src/lib/elm_widget_hoversel.h @@ -0,0 +1,194 @@ +#ifndef ELM_WIDGET_HOVERSEL_H +#define ELM_WIDGET_HOVERSEL_H + +#include "elm_widget_button.h" + +#ifdef HAVE_EIO +# include +#endif + +/** + * @addtogroup Widget + * @{ + * + * @section elm-hoversel-class The Elementary Hoversel Class + * + * Elementary, besides having the @ref Hoversel widget, exposes its + * foundation -- the Elementary Hoversel Class -- in order to create other + * widgets which are a hoversel with some more logic on top. + */ + +/** + * @def ELM_HOVERSEL_CLASS + * + * Use this macro to cast whichever subclass of + * #Elm_Hoversel_Smart_Class into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_HOVERSEL_CLASS(x) ((Elm_Hoversel_Smart_Class *)x) + +/** + * @def ELM_HOVERSEL_DATA + * + * Use this macro to cast whichever subdata of + * #Elm_Hoversel_Smart_Data into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_HOVERSEL_DATA(x) ((Elm_Hoversel_Smart_Data *)x) + +/** + * @def ELM_HOVERSEL_SMART_CLASS_VERSION + * + * Current version for Elementary hoversel @b base smart class, a value + * which goes to _Elm_Hoversel_Smart_Class::version. + * + * @ingroup Widget + */ +#define ELM_HOVERSEL_SMART_CLASS_VERSION 1 + +/** + * @def ELM_HOVERSEL_SMART_CLASS_INIT + * + * Initializer for a whole #Elm_Hoversel_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_HOVERSEL_SMART_CLASS_INIT_NULL + * @see ELM_HOVERSEL_SMART_CLASS_INIT_NAME_VERSION + * + * @ingroup Widget + */ +#define ELM_HOVERSEL_SMART_CLASS_INIT(smart_class_init) \ + {smart_class_init, ELM_HOVERSEL_SMART_CLASS_VERSION} + +/** + * @def ELM_HOVERSEL_SMART_CLASS_INIT_NULL + * + * Initializer to zero out a whole #Elm_Hoversel_Smart_Class structure. + * + * @see ELM_HOVERSEL_SMART_CLASS_INIT_NAME_VERSION + * @see ELM_HOVERSEL_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_HOVERSEL_SMART_CLASS_INIT_NULL \ + ELM_HOVERSEL_SMART_CLASS_INIT(EVAS_SMART_CLASS_INIT_NULL) + +/** + * @def ELM_HOVERSEL_SMART_CLASS_INIT_NAME_VERSION + * + * Initializer to zero out a whole #Elm_Hoversel_Smart_Class structure and + * set its name and version. + * + * This is similar to #ELM_HOVERSEL_SMART_CLASS_INIT_NULL, but it will + * also set the version field of #Elm_Hoversel_Smart_Class (base field) + * to the latest #ELM_HOVERSEL_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_HOVERSEL_SMART_CLASS_INIT_NULL + * @see ELM_HOVERSEL_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_HOVERSEL_SMART_CLASS_INIT_NAME_VERSION(name) \ + ELM_HOVERSEL_SMART_CLASS_INIT \ + (ELM_BUTTON_SMART_CLASS_INIT_NAME_VERSION(name)) + +/** + * Elementary hoversel base smart class. This inherits directly from + * #Elm_Button_Smart_Class and is meant to build widgets extending the + * behavior of a hoversel. + * + * All of the functions listed on @ref Hoversel namespace will work for + * objects deriving from #Elm_Hoversel_Smart_Class. + */ +typedef struct _Elm_Hoversel_Smart_Class +{ + Elm_Button_Smart_Class base; + + int version; /**< Version of this smart class definition */ +} Elm_Hoversel_Smart_Class; + +/** + * Base button smart data extended with hoversel instance data. + */ +typedef struct _Elm_Hoversel_Smart_Data Elm_Hoversel_Smart_Data; +struct _Elm_Hoversel_Smart_Data +{ + Elm_Button_Smart_Data base; + + /* aggregates a hover */ + Evas_Object *hover; + Evas_Object *hover_parent; + + Eina_List *items; + + Eina_Bool horizontal : 1; + Eina_Bool expanded : 1; +}; + +typedef struct _Elm_Hoversel_Item Elm_Hoversel_Item; +struct _Elm_Hoversel_Item +{ + ELM_WIDGET_ITEM; + + const char *label; + const char *icon_file; + const char *icon_group; + + Elm_Icon_Type icon_type; + Evas_Smart_Cb func; +}; + +/** + * @} + */ + +EAPI extern const char ELM_HOVERSEL_SMART_NAME[]; +EAPI const Elm_Hoversel_Smart_Class *elm_hoversel_smart_class_get(void); + +#define ELM_HOVERSEL_DATA_GET(o, sd) \ + Elm_Hoversel_Smart_Data * sd = evas_object_smart_data_get(o) + +#define ELM_HOVERSEL_DATA_GET_OR_RETURN(o, ptr) \ + ELM_HOVERSEL_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return; \ + } + +#define ELM_HOVERSEL_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_HOVERSEL_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return val; \ + } + +#define ELM_HOVERSEL_CHECK(obj) \ + if (!obj || !elm_widget_type_check \ + ((obj), ELM_HOVERSEL_SMART_NAME, __func__)) \ + return + +#define ELM_HOVERSEL_ITEM_CHECK(it) \ + ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)it, ); \ + ELM_HOVERSEL_CHECK(it->base.widget); + +#define ELM_HOVERSEL_ITEM_CHECK_OR_RETURN(it, ...) \ + ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)it, __VA_ARGS__); \ + ELM_HOVERSEL_CHECK(it->base.widget) __VA_ARGS__; + +#endif