[elm] Bubble now inheritable.

SVN revision: 74764
This commit is contained in:
Gustavo Lima Chaves 2012-08-01 21:04:39 +00:00
parent 65410cb43a
commit 4cb288dc1a
3 changed files with 190 additions and 44 deletions

View File

@ -46,6 +46,7 @@ elm_widget.h \
elm_widget_actionslider.h \
elm_widget_bg.h \
elm_widget_box.h \
elm_widget_bubble.h \
elm_widget_button.h \
elm_widget_calendar.h \
elm_widget_check.h \

View File

@ -1,17 +1,8 @@
#include <Elementary.h>
#include "elm_priv.h"
#include "elm_widget_layout.h"
#include "elm_widget_bubble.h"
static const char BUBBLE_SMART_NAME[] = "elm_bubble";
typedef struct _Elm_Bubble_Smart_Data Elm_Bubble_Smart_Data;
struct _Elm_Bubble_Smart_Data
{
Elm_Layout_Smart_Data base;
Elm_Bubble_Pos pos;
};
EAPI const char ELM_BUBBLE_SMART_NAME[] = "elm_bubble";
static const char SIG_CLICKED[] = "clicked";
@ -43,35 +34,8 @@ static const char *corner_string[] =
"bottom_right"
};
#define ELM_BUBBLE_DATA_GET(o, sd) \
Elm_Bubble_Smart_Data * sd = evas_object_smart_data_get(o)
#define ELM_BUBBLE_DATA_GET_OR_RETURN(o, ptr) \
ELM_BUBBLE_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRITICAL("No widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
return; \
}
#define ELM_BUBBLE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
ELM_BUBBLE_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRITICAL("No widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
return val; \
}
#define ELM_BUBBLE_CHECK(obj) \
if (!obj || !elm_widget_type_check((obj), BUBBLE_SMART_NAME, __func__)) \
return
/* Inheriting from elm_layout. Besides, we need no more than what is
* there */
EVAS_SMART_SUBCLASS_NEW
(BUBBLE_SMART_NAME, _elm_bubble, Elm_Layout_Smart_Class,
(ELM_BUBBLE_SMART_NAME, _elm_bubble, Elm_Bubble_Smart_Class,
Elm_Layout_Smart_Class, elm_layout_smart_class_get, _smart_callbacks);
static void
@ -178,18 +142,36 @@ _elm_bubble_smart_add(Evas_Object *obj)
}
static void
_elm_bubble_smart_set_user(Elm_Layout_Smart_Class *sc)
_elm_bubble_smart_set_user(Elm_Bubble_Smart_Class *sc)
{
ELM_WIDGET_CLASS(sc)->base.add = _elm_bubble_smart_add;
ELM_WIDGET_CLASS(sc)->focus_next = _elm_bubble_smart_focus_next;
ELM_WIDGET_CLASS(sc)->focus_direction = _elm_bubble_smart_focus_direction;
sc->text_set = _elm_bubble_smart_text_set;
sc->sizing_eval = _elm_bubble_smart_sizing_eval;
ELM_LAYOUT_CLASS(sc)->text_set = _elm_bubble_smart_text_set;
ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_bubble_smart_sizing_eval;
sc->content_aliases = _content_aliases;
sc->text_aliases = _text_aliases;
ELM_LAYOUT_CLASS(sc)->content_aliases = _content_aliases;
ELM_LAYOUT_CLASS(sc)->text_aliases = _text_aliases;
}
EAPI const Elm_Bubble_Smart_Class *
elm_bubble_smart_class_get(void)
{
static Elm_Bubble_Smart_Class _sc =
ELM_BUBBLE_SMART_CLASS_INIT_NAME_VERSION(ELM_BUBBLE_SMART_NAME);
static const Elm_Bubble_Smart_Class *class = NULL;
Evas_Smart_Class *esc = (Evas_Smart_Class *)&_sc;
if (class)
return class;
_elm_bubble_smart_set(&_sc);
esc->callbacks = _smart_callbacks;
class = &_sc;
return class;
}
EAPI Evas_Object *

View File

@ -0,0 +1,163 @@
#ifndef ELM_WIDGET_BUBBLE_H
#define ELM_WIDGET_BUBBLE_H
#include "elm_widget_layout.h"
/**
* @addtogroup Widget
* @{
*
* @section elm-bubble-class The Elementary Bubble Class
*
* Elementary, besides having the @ref Bubble widget, exposes its
* foundation -- the Elementary Bubble Class -- in order to create other
* widgets which are a bubble with some more logic on top.
*/
/**
* @def ELM_BUBBLE_CLASS
*
* Use this macro to cast whichever subclass of
* #Elm_Bubble_Smart_Class into it, so to access its fields.
*
* @ingroup Widget
*/
#define ELM_BUBBLE_CLASS(x) ((Elm_Bubble_Smart_Class *)x)
/**
* @def ELM_BUBBLE_DATA
*
* Use this macro to cast whichever subdata of
* #Elm_Bubble_Smart_Data into it, so to access its fields.
*
* @ingroup Widget
*/
#define ELM_BUBBLE_DATA(x) ((Elm_Bubble_Smart_Data *)x)
/**
* @def ELM_BUBBLE_SMART_CLASS_VERSION
*
* Current version for Elementary bubble @b base smart class, a value
* which goes to _Elm_Bubble_Smart_Class::version.
*
* @ingroup Widget
*/
#define ELM_BUBBLE_SMART_CLASS_VERSION 1
/**
* @def ELM_BUBBLE_SMART_CLASS_INIT
*
* Initializer for a whole #Elm_Bubble_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_BUBBLE_SMART_CLASS_INIT_NULL
* @see ELM_BUBBLE_SMART_CLASS_INIT_NAME_VERSION
*
* @ingroup Widget
*/
#define ELM_BUBBLE_SMART_CLASS_INIT(smart_class_init) \
{smart_class_init, ELM_BUBBLE_SMART_CLASS_VERSION}
/**
* @def ELM_BUBBLE_SMART_CLASS_INIT_NULL
*
* Initializer to zero out a whole #Elm_Bubble_Smart_Class structure.
*
* @see ELM_BUBBLE_SMART_CLASS_INIT_NAME_VERSION
* @see ELM_BUBBLE_SMART_CLASS_INIT
*
* @ingroup Widget
*/
#define ELM_BUBBLE_SMART_CLASS_INIT_NULL \
ELM_BUBBLE_SMART_CLASS_INIT(EVAS_SMART_CLASS_INIT_NULL)
/**
* @def ELM_BUBBLE_SMART_CLASS_INIT_NAME_VERSION
*
* Initializer to zero out a whole #Elm_Bubble_Smart_Class structure and
* set its name and version.
*
* This is similar to #ELM_BUBBLE_SMART_CLASS_INIT_NULL, but it will
* also set the version field of #Elm_Bubble_Smart_Class (base field)
* to the latest #ELM_BUBBLE_SMART_CLASS_VERSION and name it to the
* specific value.
*
* It will keep a reference to the name field as a <c>"const char *"</c>,
* i.e., the name must be available while the structure is
* used (hint: static or global variable!) and must not be modified.
*
* @see ELM_BUBBLE_SMART_CLASS_INIT_NULL
* @see ELM_BUBBLE_SMART_CLASS_INIT
*
* @ingroup Widget
*/
#define ELM_BUBBLE_SMART_CLASS_INIT_NAME_VERSION(name) \
ELM_BUBBLE_SMART_CLASS_INIT \
(ELM_LAYOUT_SMART_CLASS_INIT_NAME_VERSION(name))
/**
* Elementary bubble base smart class. This inherits directly from
* #Elm_Layout_Smart_Class and is meant to build widgets extending the
* behavior of a bubble.
*
* All of the functions listed on @ref Bubble namespace will work for
* objects deriving from #Elm_Bubble_Smart_Class.
*/
typedef struct _Elm_Bubble_Smart_Class
{
Elm_Layout_Smart_Class base;
int version; /**< Version of this smart class definition */
} Elm_Bubble_Smart_Class;
/**
* Base layout smart data extended with bubble instance data.
*/
typedef struct _Elm_Bubble_Smart_Data Elm_Bubble_Smart_Data;
struct _Elm_Bubble_Smart_Data
{
Elm_Layout_Smart_Data base;
Elm_Bubble_Pos pos;
};
/**
* @}
*/
EAPI extern const char ELM_BUBBLE_SMART_NAME[];
EAPI const Elm_Bubble_Smart_Class
*elm_bubble_smart_class_get(void);
#define ELM_BUBBLE_DATA_GET(o, sd) \
Elm_Bubble_Smart_Data * sd = evas_object_smart_data_get(o)
#define ELM_BUBBLE_DATA_GET_OR_RETURN(o, ptr) \
ELM_BUBBLE_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRITICAL("No widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
return; \
}
#define ELM_BUBBLE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
ELM_BUBBLE_DATA_GET(o, ptr); \
if (!ptr) \
{ \
CRITICAL("No widget data for object %p (%s)", \
o, evas_object_type_get(o)); \
return val; \
}
#define ELM_BUBBLE_CHECK(obj) \
if (!obj || !elm_widget_type_check \
((obj), ELM_BUBBLE_SMART_NAME, __func__)) \
return
#endif