forked from enlightenment/efl
elementary/label - added a label signal callback "slide,end"
SVN revision: 82263
This commit is contained in:
parent
6302d12079
commit
5ab4c3ce0b
|
@ -886,3 +886,7 @@
|
||||||
2012-01-04 ChunEon Park <hermet@hermet.pe.kr>
|
2012-01-04 ChunEon Park <hermet@hermet.pe.kr>
|
||||||
|
|
||||||
* Deprecate elm_label_slide_set()/get() and added elm_label_slide_mode_set()/get() instead and elm_label_slide_go().
|
* Deprecate elm_label_slide_set()/get() and added elm_label_slide_mode_set()/get() instead and elm_label_slide_go().
|
||||||
|
|
||||||
|
2012-01-05 ChunEon Park <hermet@hermet.pe.kr>
|
||||||
|
|
||||||
|
* Added a label signal callback "slide,end"
|
||||||
|
|
|
@ -28,6 +28,7 @@ Additions:
|
||||||
* Add elm_systray.[ch]: Add support to D-Bus systray icons.
|
* Add elm_systray.[ch]: Add support to D-Bus systray icons.
|
||||||
* Add elm_label_slide_mode_set(), elm_label_slide_mode_get()
|
* Add elm_label_slide_mode_set(), elm_label_slide_mode_get()
|
||||||
* Add elm_label_slide_go()
|
* Add elm_label_slide_go()
|
||||||
|
* Add a label signal callback "slide,end"
|
||||||
|
|
||||||
Improvements:
|
Improvements:
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,15 @@ EAPI Eo_Op ELM_OBJ_LABEL_BASE_ID = EO_NOOP;
|
||||||
|
|
||||||
#define MY_CLASS_NAME "elm_label"
|
#define MY_CLASS_NAME "elm_label"
|
||||||
|
|
||||||
|
static const char SIG_SLIDE_END[] = "slide,end";
|
||||||
|
static const char SIG_LANGUAGE_CHANGED[] = "language,changed";
|
||||||
|
|
||||||
|
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
|
||||||
|
{SIG_LANGUAGE_CHANGED, ""},
|
||||||
|
{SIG_SLIDE_END, ""},
|
||||||
|
{NULL, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
static const Elm_Layout_Part_Alias_Description _text_aliases[] =
|
static const Elm_Layout_Part_Alias_Description _text_aliases[] =
|
||||||
{
|
{
|
||||||
{"default", "elm.text"},
|
{"default", "elm.text"},
|
||||||
|
@ -337,7 +346,7 @@ static void
|
||||||
_elm_label_smart_translate(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
|
_elm_label_smart_translate(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
|
||||||
{
|
{
|
||||||
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
|
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
|
||||||
evas_object_smart_callback_call(obj, "language,changed", NULL);
|
evas_object_smart_callback_call(obj, SIG_LANGUAGE_CHANGED, NULL);
|
||||||
|
|
||||||
if (ret) *ret = EINA_TRUE;
|
if (ret) *ret = EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -353,6 +362,13 @@ _access_info_cb(void *data __UNUSED__, Evas_Object *obj)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_on_slide_end(void *data, Evas_Object *obj __UNUSED__,
|
||||||
|
const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||||
|
{
|
||||||
|
evas_object_smart_callback_call(data, SIG_SLIDE_END, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
_elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||||
{
|
{
|
||||||
|
@ -372,6 +388,9 @@ _elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||||
(wd->resize_obj, EVAS_CALLBACK_RESIZE,
|
(wd->resize_obj, EVAS_CALLBACK_RESIZE,
|
||||||
_on_label_resize, obj);
|
_on_label_resize, obj);
|
||||||
|
|
||||||
|
edje_object_signal_callback_add(wd->resize_obj, "elm,state,slide,end", "",
|
||||||
|
_on_slide_end, obj);
|
||||||
|
|
||||||
elm_widget_can_focus_set(obj, EINA_FALSE);
|
elm_widget_can_focus_set(obj, EINA_FALSE);
|
||||||
|
|
||||||
elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj));
|
elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj));
|
||||||
|
@ -382,7 +401,7 @@ _elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||||
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Label"));
|
(_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Label"));
|
||||||
_elm_access_callback_set
|
_elm_access_callback_set
|
||||||
(_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
|
(_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
|
||||||
|
|
||||||
elm_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -400,7 +419,8 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
||||||
{
|
{
|
||||||
eo_do_super(obj, eo_constructor());
|
eo_do_super(obj, eo_constructor());
|
||||||
eo_do(obj,
|
eo_do(obj,
|
||||||
evas_obj_type_set(MY_CLASS_NAME));
|
evas_obj_type_set(MY_CLASS_NAME),
|
||||||
|
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
|
||||||
|
|
||||||
Evas_Object *parent = eo_parent_get(obj);
|
Evas_Object *parent = eo_parent_get(obj);
|
||||||
if (!elm_widget_sub_object_add(parent, obj))
|
if (!elm_widget_sub_object_add(parent, obj))
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
* This widget emits the following signals, besides the ones sent from
|
* This widget emits the following signals, besides the ones sent from
|
||||||
* @ref Layout:
|
* @ref Layout:
|
||||||
* @li @c "language,changed": The program's language changed.
|
* @li @c "language,changed": The program's language changed.
|
||||||
|
* @li @c "slide,end": The slide is end.
|
||||||
*
|
*
|
||||||
* See @ref tutorial_label for a demonstration of how to use a label widget.
|
* See @ref tutorial_label for a demonstration of how to use a label widget.
|
||||||
* @{
|
* @{
|
||||||
|
|
Loading…
Reference in New Issue