diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index aef4826b88..2849054c66 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/src/lib/Makefile.am @@ -78,6 +78,7 @@ elm_widget_map.h \ elm_widget_menu.h \ elm_widget_naviframe.h \ elm_widget_notify.h \ +elm_widget_panes.h \ elm_widget_photo.h \ elm_widget_photocam.h \ elm_widget_player.h \ diff --git a/legacy/elementary/src/lib/elm_panes.c b/legacy/elementary/src/lib/elm_panes.c index 0b1e6f9d21..9f91068ba5 100644 --- a/legacy/elementary/src/lib/elm_panes.c +++ b/legacy/elementary/src/lib/elm_panes.c @@ -1,6 +1,6 @@ #include #include "elm_priv.h" -#include "elm_widget_layout.h" +#include "elm_widget_panes.h" /** * TODO @@ -9,25 +9,7 @@ * Add events (move, start ...) */ -static const char PANES_SMART_NAME[] = "elm_panes"; - -typedef struct _Elm_Panes_Smart_Data Elm_Panes_Smart_Data; - -struct _Elm_Panes_Smart_Data -{ - Elm_Layout_Smart_Data base; - - struct - { - int x_diff; - int y_diff; - Eina_Bool move; - } move; - - Eina_Bool double_clicked : 1; - Eina_Bool horizontal : 1; - Eina_Bool fixed : 1; -}; +EAPI const char ELM_PANES_SMART_NAME[] = "elm_panes"; static const char SIG_CLICKED[] = "clicked"; static const char SIG_PRESS[] = "press"; @@ -48,35 +30,8 @@ static const Elm_Layout_Part_Alias_Description _content_aliases[] = {NULL, NULL} }; -#define ELM_PANES_DATA_GET(o, sd) \ - Elm_Panes_Smart_Data * sd = evas_object_smart_data_get(o) - -#define ELM_PANES_DATA_GET_OR_RETURN(o, ptr) \ - ELM_PANES_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return; \ - } - -#define ELM_PANES_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ - ELM_PANES_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return val; \ - } - -#define ELM_PANES_CHECK(obj) \ - if (!obj || !elm_widget_type_check((obj), PANES_SMART_NAME, __func__)) \ - return - -/* Inheriting from elm_layout. Besides, we need no more than what is - * there */ EVAS_SMART_SUBCLASS_NEW - (PANES_SMART_NAME, _elm_panes, Elm_Layout_Smart_Class, + (ELM_PANES_SMART_NAME, _elm_panes, Elm_Panes_Smart_Class, Elm_Layout_Smart_Class, elm_layout_smart_class_get, _smart_callbacks); static Eina_Bool @@ -229,14 +184,32 @@ _elm_panes_smart_add(Evas_Object *obj) } static void -_elm_panes_smart_set_user(Elm_Layout_Smart_Class *sc) +_elm_panes_smart_set_user(Elm_Panes_Smart_Class *sc) { ELM_WIDGET_CLASS(sc)->base.add = _elm_panes_smart_add; ELM_WIDGET_CLASS(sc)->theme = _elm_panes_smart_theme; ELM_WIDGET_CLASS(sc)->focus_next = _elm_panes_smart_focus_next; - sc->content_aliases = _content_aliases; + ELM_LAYOUT_CLASS(sc)->content_aliases = _content_aliases; +} + +EAPI const Elm_Panes_Smart_Class * +elm_panes_smart_class_get(void) +{ + static Elm_Panes_Smart_Class _sc = + ELM_PANES_SMART_CLASS_INIT_NAME_VERSION(ELM_PANES_SMART_NAME); + static const Elm_Panes_Smart_Class *class = NULL; + Evas_Smart_Class *esc = (Evas_Smart_Class *)&_sc; + + if (class) + return class; + + _elm_panes_smart_set(&_sc); + esc->callbacks = _smart_callbacks; + class = &_sc; + + return class; } EAPI Evas_Object * diff --git a/legacy/elementary/src/lib/elm_widget_panes.h b/legacy/elementary/src/lib/elm_widget_panes.h new file mode 100644 index 0000000000..8afe99a1c6 --- /dev/null +++ b/legacy/elementary/src/lib/elm_widget_panes.h @@ -0,0 +1,172 @@ +#ifndef ELM_WIDGET_PANES_H +#define ELM_WIDGET_PANES_H + +#include "elm_widget_layout.h" + +/** + * @addtogroup Widget + * @{ + * + * @section elm-panes-class The Elementary Panes Class + * + * Elementary, besides having the @ref Panes widget, exposes its + * foundation -- the Elementary Panes Class -- in order to create other + * widgets which are a panes with some more logic on top. + */ + +/** + * @def ELM_PANES_CLASS + * + * Use this macro to cast whichever subclass of + * #Elm_Panes_Smart_Class into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_PANES_CLASS(x) ((Elm_Panes_Smart_Class *)x) + +/** + * @def ELM_PANES_DATA + * + * Use this macro to cast whichever subdata of + * #Elm_Panes_Smart_Data into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_PANES_DATA(x) ((Elm_Panes_Smart_Data *)x) + +/** + * @def ELM_PANES_SMART_CLASS_VERSION + * + * Current version for Elementary panes @b base smart class, a value + * which goes to _Elm_Panes_Smart_Class::version. + * + * @ingroup Widget + */ +#define ELM_PANES_SMART_CLASS_VERSION 1 + +/** + * @def ELM_PANES_SMART_CLASS_INIT + * + * Initializer for a whole #Elm_Panes_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_PANES_SMART_CLASS_INIT_NULL + * @see ELM_PANES_SMART_CLASS_INIT_NAME_VERSION + * + * @ingroup Widget + */ +#define ELM_PANES_SMART_CLASS_INIT(smart_class_init) \ + {smart_class_init, ELM_PANES_SMART_CLASS_VERSION} + +/** + * @def ELM_PANES_SMART_CLASS_INIT_NULL + * + * Initializer to zero out a whole #Elm_Panes_Smart_Class structure. + * + * @see ELM_PANES_SMART_CLASS_INIT_NAME_VERSION + * @see ELM_PANES_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_PANES_SMART_CLASS_INIT_NULL \ + ELM_PANES_SMART_CLASS_INIT(EVAS_SMART_CLASS_INIT_NULL) + +/** + * @def ELM_PANES_SMART_CLASS_INIT_NAME_VERSION + * + * Initializer to zero out a whole #Elm_Panes_Smart_Class structure and + * set its name and version. + * + * This is similar to #ELM_PANES_SMART_CLASS_INIT_NULL, but it will + * also set the version field of #Elm_Panes_Smart_Class (base field) + * to the latest #ELM_PANES_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_PANES_SMART_CLASS_INIT_NULL + * @see ELM_PANES_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_PANES_SMART_CLASS_INIT_NAME_VERSION(name) \ + ELM_PANES_SMART_CLASS_INIT \ + (ELM_LAYOUT_SMART_CLASS_INIT_NAME_VERSION(name)) + +/** + * Elementary panes base smart class. This inherits directly from + * #Elm_Layout_Smart_Class and is meant to build widgets extending the + * behavior of a panes. + * + * All of the functions listed on @ref Panes namespace will work for + * objects deriving from #Elm_Panes_Smart_Class. + */ +typedef struct _Elm_Panes_Smart_Class +{ + Elm_Layout_Smart_Class base; + + int version; /**< Version of this smart class definition */ +} Elm_Panes_Smart_Class; + +/** + * Base layout smart data extended with panes instance data. + */ +typedef struct _Elm_Panes_Smart_Data Elm_Panes_Smart_Data; +struct _Elm_Panes_Smart_Data +{ + Elm_Layout_Smart_Data base; + + struct + { + int x_diff; + int y_diff; + Eina_Bool move; + } move; + + Eina_Bool double_clicked : 1; + Eina_Bool horizontal : 1; + Eina_Bool fixed : 1; +}; + +/** + * @} + */ + +EAPI extern const char ELM_PANES_SMART_NAME[]; +EAPI const Elm_Panes_Smart_Class +*elm_panes_smart_class_get(void); + +#define ELM_PANES_DATA_GET(o, sd) \ + Elm_Panes_Smart_Data * sd = evas_object_smart_data_get(o) + +#define ELM_PANES_DATA_GET_OR_RETURN(o, ptr) \ + ELM_PANES_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return; \ + } + +#define ELM_PANES_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_PANES_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return val; \ + } + +#define ELM_PANES_CHECK(obj) \ + if (!obj || !elm_widget_type_check \ + ((obj), ELM_PANES_SMART_NAME, __func__)) \ + return + +#endif