Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_callbacks.c edje_util.c
Log Message:
use hold event and emit hold,on and hold,off
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- edje_calc.c 24 Mar 2008 08:22:00 -0000 1.122
+++ edje_calc.c 31 Mar 2008 21:38:51 -0000 1.123
@@ -549,12 +549,14 @@
if (chosen_desc->text.id_source >= 0)
{
ep->text.source = ed->table_parts[chosen_desc->text.id_source %
ed->table_parts_size];
- style = ep->text.source->chosen_description->text.style;
+ if (ep->text.source->chosen_description->text.style)
+ style = ep->text.source->chosen_description->text.style;
}
else
{
ep->text.source = NULL;
- style = chosen_desc->text.style;
+ if (chosen_desc->text.style)
+ style = chosen_desc->text.style;
}
if (chosen_desc->text.id_text_source >= 0)
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_callbacks.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- edje_callbacks.c 8 Sep 2007 18:31:56 -0000 1.25
+++ edje_callbacks.c 31 Mar 2008 21:38:51 -0000 1.26
@@ -6,6 +6,25 @@
#include "edje_private.h"
void
+_edje_hold_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
+{
+ Evas_Event_Hold *ev;
+ Edje *ed;
+ Edje_Real_Part *rp;
+
+ ev = event_info;
+ ed = data;
+ rp = evas_object_data_get(obj, "real_part");
+ if (!rp) return;
+ if (ev->hold)
+ _edje_emit(ed, "hold,on", rp->part->name);
+ else
+ _edje_emit(ed, "hold,off", rp->part->name);
+ return;
+ e = NULL;
+}
+
+void
_edje_mouse_in_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
{
Evas_Event_Mouse_In *ev;
@@ -369,6 +388,10 @@
_edje_callbacks_add(Evas_Object *obj, Edje *ed, Edje_Real_Part *rp)
{
evas_object_event_callback_add(obj,
+ EVAS_CALLBACK_HOLD,
+ _edje_hold_cb,
+ ed);
+ evas_object_event_callback_add(obj,
EVAS_CALLBACK_MOUSE_IN,
_edje_mouse_in_cb,
ed);
@@ -398,6 +421,9 @@
void
_edje_callbacks_del(Evas_Object *obj)
{
+ evas_object_event_callback_del(obj,
+ EVAS_CALLBACK_HOLD,
+ _edje_hold_cb);
evas_object_event_callback_del(obj,
EVAS_CALLBACK_MOUSE_IN,
_edje_mouse_in_cb);
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- edje_util.c 24 Mar 2008 08:22:01 -0000 1.105
+++ edje_util.c 31 Mar 2008 21:38:51 -0000 1.106
@@ -1201,6 +1201,10 @@
pep = ep;
didw = 1;
}
+ if ((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK))
+ {
+ /* FIXME: do something */
+ }
}
if (!((ep->chosen_description) &&
(ep->chosen_description->fixed.h)))
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
