From 6839ffb7738ed79ee8a709b9a42caaae774b64c8 Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Tue, 31 Jul 2012 22:06:47 +0000 Subject: [PATCH] [elm] Separator now inheritable. SVN revision: 74690 --- src/lib/Makefile.am | 1 + src/lib/elm_separator.c | 65 ++++++----------- src/lib/elm_widget_separator.h | 162 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 42 deletions(-) create mode 100644 src/lib/elm_widget_separator.h diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index fd74eb6..1c1f260 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -67,6 +67,7 @@ elm_widget_plug.h \ elm_widget_progressbar.h \ elm_widget_route.h \ elm_widget_scroller.h \ +elm_widget_separator.h \ elm_widget_slider.h \ elm_widget_slideshow.h \ elm_widget_table.h \ diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c index 895b665..1b9e27e 100644 --- a/src/lib/elm_separator.c +++ b/src/lib/elm_separator.c @@ -1,47 +1,11 @@ #include #include "elm_priv.h" -#include "elm_widget_layout.h" +#include "elm_widget_separator.h" -static const char SEPARATOR_SMART_NAME[] = "elm_separator"; +EAPI const char ELM_SEPARATOR_SMART_NAME[] = "elm_separator"; -typedef struct _Elm_Separator_Smart_Data Elm_Separator_Smart_Data; - -struct _Elm_Separator_Smart_Data -{ - Elm_Layout_Smart_Data base; - - Eina_Bool horizontal : 1; -}; - -#define ELM_SEPARATOR_DATA_GET(o, sd) \ - Elm_Separator_Smart_Data * sd = evas_object_smart_data_get(o) - -#define ELM_SEPARATOR_DATA_GET_OR_RETURN(o, ptr) \ - ELM_SEPARATOR_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return; \ - } - -#define ELM_SEPARATOR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ - ELM_SEPARATOR_DATA_GET(o, ptr); \ - if (!ptr) \ - { \ - CRITICAL("No widget data for object %p (%s)", \ - o, evas_object_type_get(o)); \ - return val; \ - } - -#define ELM_SEPARATOR_CHECK(obj) \ - if (!obj || !elm_widget_type_check((obj), SEPARATOR_SMART_NAME, __func__)) \ - return - -/* Inheriting from elm_layout. Besides, we need no more than what is - * there */ EVAS_SMART_SUBCLASS_NEW - (SEPARATOR_SMART_NAME, _elm_separator, Elm_Layout_Smart_Class, + (ELM_SEPARATOR_SMART_NAME, _elm_separator, Elm_Separator_Smart_Class, Elm_Layout_Smart_Class, elm_layout_smart_class_get, NULL); static Eina_Bool @@ -54,7 +18,8 @@ _elm_separator_smart_theme(Evas_Object *obj) else eina_stringshare_replace(&(ELM_LAYOUT_DATA(sd)->group), "vertical"); - if (!ELM_WIDGET_CLASS(_elm_separator_parent_sc)->theme(obj)) return EINA_FALSE; + if (!ELM_WIDGET_CLASS(_elm_separator_parent_sc)->theme(obj)) + return EINA_FALSE; return EINA_TRUE; } @@ -90,7 +55,7 @@ _elm_separator_smart_add(Evas_Object *obj) } static void -_elm_separator_smart_set_user(Elm_Layout_Smart_Class *sc) +_elm_separator_smart_set_user(Elm_Separator_Smart_Class *sc) { ELM_WIDGET_CLASS(sc)->base.add = _elm_separator_smart_add; @@ -100,7 +65,23 @@ _elm_separator_smart_set_user(Elm_Layout_Smart_Class *sc) ELM_WIDGET_CLASS(sc)->focus_next = NULL; ELM_WIDGET_CLASS(sc)->focus_direction = NULL; - sc->sizing_eval = _elm_separator_smart_sizing_eval; + ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_separator_smart_sizing_eval; +} + +EAPI const Elm_Separator_Smart_Class * +elm_separator_smart_class_get(void) +{ + static Elm_Separator_Smart_Class _sc = + ELM_SEPARATOR_SMART_CLASS_INIT_NAME_VERSION(ELM_SEPARATOR_SMART_NAME); + static const Elm_Separator_Smart_Class *class = NULL; + + if (class) + return class; + + _elm_separator_smart_set(&_sc); + class = &_sc; + + return class; } EAPI Evas_Object * diff --git a/src/lib/elm_widget_separator.h b/src/lib/elm_widget_separator.h new file mode 100644 index 0000000..182159c --- /dev/null +++ b/src/lib/elm_widget_separator.h @@ -0,0 +1,162 @@ +#ifndef ELM_WIDGET_SEPARATOR_H +#define ELM_WIDGET_SEPARATOR_H + +#include "elm_widget_layout.h" + +/** + * @addtogroup Widget + * @{ + * + * @section elm-separator-class The Elementary Separator Class + * + * Elementary, besides having the @ref Separator widget, exposes its + * foundation -- the Elementary Separator Class -- in order to create other + * widgets which are a separator with some more logic on top. + */ + +/** + * @def ELM_SEPARATOR_CLASS + * + * Use this macro to cast whichever subclass of + * #Elm_Separator_Smart_Class into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_SEPARATOR_CLASS(x) ((Elm_Separator_Smart_Class *)x) + +/** + * @def ELM_SEPARATOR_DATA + * + * Use this macro to cast whichever subdata of + * #Elm_Separator_Smart_Data into it, so to access its fields. + * + * @ingroup Widget + */ +#define ELM_SEPARATOR_DATA(x) ((Elm_Separator_Smart_Data *)x) + +/** + * @def ELM_SEPARATOR_SMART_CLASS_VERSION + * + * Current version for Elementary separator @b base smart class, a value + * which goes to _Elm_Separator_Smart_Class::version. + * + * @ingroup Widget + */ +#define ELM_SEPARATOR_SMART_CLASS_VERSION 1 + +/** + * @def ELM_SEPARATOR_SMART_CLASS_INIT + * + * Initializer for a whole #Elm_Separator_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_SEPARATOR_SMART_CLASS_INIT_NULL + * @see ELM_SEPARATOR_SMART_CLASS_INIT_NAME_VERSION + * + * @ingroup Widget + */ +#define ELM_SEPARATOR_SMART_CLASS_INIT(smart_class_init) \ + {smart_class_init, ELM_SEPARATOR_SMART_CLASS_VERSION} + +/** + * @def ELM_SEPARATOR_SMART_CLASS_INIT_NULL + * + * Initializer to zero out a whole #Elm_Separator_Smart_Class structure. + * + * @see ELM_SEPARATOR_SMART_CLASS_INIT_NAME_VERSION + * @see ELM_SEPARATOR_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_SEPARATOR_SMART_CLASS_INIT_NULL \ + ELM_SEPARATOR_SMART_CLASS_INIT(EVAS_SMART_CLASS_INIT_NULL) + +/** + * @def ELM_SEPARATOR_SMART_CLASS_INIT_NAME_VERSION + * + * Initializer to zero out a whole #Elm_Separator_Smart_Class structure and + * set its name and version. + * + * This is similar to #ELM_SEPARATOR_SMART_CLASS_INIT_NULL, but it will + * also set the version field of #Elm_Separator_Smart_Class (base field) + * to the latest #ELM_SEPARATOR_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_SEPARATOR_SMART_CLASS_INIT_NULL + * @see ELM_SEPARATOR_SMART_CLASS_INIT + * + * @ingroup Widget + */ +#define ELM_SEPARATOR_SMART_CLASS_INIT_NAME_VERSION(name) \ + ELM_SEPARATOR_SMART_CLASS_INIT \ + (ELM_LAYOUT_SMART_CLASS_INIT_NAME_VERSION(name)) + +/** + * Elementary separator base smart class. This inherits directly from + * #Elm_Layout_Smart_Class and is meant to build widgets extending the + * behavior of a separator. + * + * All of the functions listed on @ref Separator namespace will work for + * objects deriving from #Elm_Separator_Smart_Class. + */ +typedef struct _Elm_Separator_Smart_Class +{ + Elm_Layout_Smart_Class base; + + int version; /**< Version of this smart class definition */ +} Elm_Separator_Smart_Class; + +/** + * Base layout smart data extended with separator instance data. + */ +typedef struct _Elm_Separator_Smart_Data Elm_Separator_Smart_Data; +struct _Elm_Separator_Smart_Data +{ + Elm_Layout_Smart_Data base; + + Eina_Bool horizontal : 1; +}; + +/** + * @} + */ + +EAPI extern const char ELM_SEPARATOR_SMART_NAME[]; +EAPI const Elm_Separator_Smart_Class *elm_separator_smart_class_get(void); + +#define ELM_SEPARATOR_DATA_GET(o, sd) \ + Elm_Separator_Smart_Data * sd = evas_object_smart_data_get(o) + +#define ELM_SEPARATOR_DATA_GET_OR_RETURN(o, ptr) \ + ELM_SEPARATOR_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return; \ + } + +#define ELM_SEPARATOR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_SEPARATOR_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return val; \ + } + +#define ELM_SEPARATOR_CHECK(obj) \ + if (!obj || !elm_widget_type_check((obj), ELM_SEPARATOR_SMART_NAME, \ + __func__)) \ + return + +#endif -- 2.7.4