[Pkg-e-commits] [SCM] Enlightenment DR17 graphical layout and animation library branch, upstream-vcs, updated. f5b4e4555670cc3b4a24802eb44d7d47c379bee4

[raster]

The following commit has been merged in the upstream-vcs branch:
commit c93c4c211d0a724a79cd568bff804df599b44923
Author: raster <raster>
Date:   Mon Mar 31 21:38:51 2008 +0000

    use hold event and emit hold,on and hold,off

diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c
index d0cc7a1..8b390bf 100644
--- a/src/lib/edje_calc.c
+++ b/src/lib/edje_calc.c
@@ -549,12 +549,14 @@ _edje_part_recalc_single(Edje *ed,
 	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)
diff --git a/src/lib/edje_callbacks.c b/src/lib/edje_callbacks.c
index 1a008b7..07d1f38 100644
--- a/src/lib/edje_callbacks.c
+++ b/src/lib/edje_callbacks.c
@@ -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 @@ void
 _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);
@@ -399,6 +422,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);
    evas_object_event_callback_del(obj,
diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index 89cba45..2f29c73 100644
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -1201,6 +1201,10 @@ edje_object_size_min_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
 		       pep = ep;
 		       didw = 1;
 		    }
+		  if ((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK))
+		    {
+		       /* FIXME: do something */
+		    }
 	       }
 	     if (!((ep->chosen_description) &&
 		   (ep->chosen_description->fixed.h)))

-- 
Enlightenment DR17 graphical layout and animation library