summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Ghigonis <laurent@p1sec.com>2013-07-03 05:07:46 +0200
committerLaurent Ghigonis <laurent@p1sec.com>2013-07-03 05:07:46 +0200
commit95618d431c0adec7fd33f960fef6262300d38630 (patch)
treea884e9b43e437aeca7d501c405c47a538f28f45f
parentee043c41e3e5cdd35eecdb4dd166cb4720378cc5 (diff)
blobs time should be floating point
-rw-r--r--egraph.c2
-rw-r--r--targettrack.c4
-rw-r--r--targettrack.h6
3 files changed, 6 insertions, 6 deletions
diff --git a/egraph.c b/egraph.c
index 3e71982..c278f34 100644
--- a/egraph.c
+++ b/egraph.c
@@ -734,7 +734,7 @@ egraph_vertice_send_blob(Evas_Object *obj,
734 evas_object_resize(blob, size, size); 734 evas_object_resize(blob, size, size);
735 evas_object_show(blob); 735 evas_object_show(blob);
736 egraph_targettrack(blob, a->o, b->o, 736 egraph_targettrack(blob, a->o, b->o,
737 ECORE_POS_MAP_ACCELERATE, 3, _cb_blob_arrived); 737 ECORE_POS_MAP_ACCELERATE, 0.6, _cb_blob_arrived);
738} 738}
739 739
740static void 740static void
diff --git a/targettrack.c b/targettrack.c
index 118582a..9acfee8 100644
--- a/targettrack.c
+++ b/targettrack.c
@@ -12,7 +12,7 @@ static Eina_Bool _cb_targettrack(void *data, double pos);
12// if in next_targets: remove from next_targets 12// if in next_targets: remove from next_targets
13 13
14Egraph_Targettrack * 14Egraph_Targettrack *
15egraph_targettrack(Evas_Object *obj, Evas_Object *origin, Evas_Object *target, Ecore_Pos_Map map, int total_time, Egraph_Targettrack_End_Cb cb_end) 15egraph_targettrack(Evas_Object *obj, Evas_Object *origin, Evas_Object *target, Ecore_Pos_Map map, double total_time, Egraph_Targettrack_End_Cb cb_end)
16{ 16{
17 Eina_List *targets; 17 Eina_List *targets;
18 18
@@ -21,7 +21,7 @@ egraph_targettrack(Evas_Object *obj, Evas_Object *origin, Evas_Object *target, E
21} 21}
22 22
23Egraph_Targettrack * 23Egraph_Targettrack *
24egraph_targettrack_multi(Evas_Object *obj, Evas_Object *origin, Eina_List *targets, Ecore_Pos_Map map, int total_time, Egraph_Targettrack_End_Cb cb_end) 24egraph_targettrack_multi(Evas_Object *obj, Evas_Object *origin, Eina_List *targets, Ecore_Pos_Map map, double total_time, Egraph_Targettrack_End_Cb cb_end)
25{ 25{
26 Egraph_Targettrack *track; 26 Egraph_Targettrack *track;
27 27
diff --git a/targettrack.h b/targettrack.h
index b2527e7..ba67d99 100644
--- a/targettrack.h
+++ b/targettrack.h
@@ -6,7 +6,7 @@ typedef void (*Egraph_Targettrack_End_Cb)(Evas_Object *obj);
6 6
7typedef struct Egraph_Targettrack Egraph_Targettrack; 7typedef struct Egraph_Targettrack Egraph_Targettrack;
8struct Egraph_Targettrack { 8struct Egraph_Targettrack {
9 int total_time; 9 double total_time;
10 Ecore_Pos_Map map; 10 Ecore_Pos_Map map;
11 Evas_Object *obj; 11 Evas_Object *obj;
12 Evas_Coord obj_w, obj_h; 12 Evas_Coord obj_w, obj_h;
@@ -16,6 +16,6 @@ struct Egraph_Targettrack {
16 Egraph_Targettrack_End_Cb cb_end; 16 Egraph_Targettrack_End_Cb cb_end;
17}; 17};
18 18
19Egraph_Targettrack *egraph_targettrack(Evas_Object *obj, Evas_Object *origin, Evas_Object *target, Ecore_Pos_Map map, int total_time, Egraph_Targettrack_End_Cb cb_end); 19Egraph_Targettrack *egraph_targettrack(Evas_Object *obj, Evas_Object *origin, Evas_Object *target, Ecore_Pos_Map map, double total_time, Egraph_Targettrack_End_Cb cb_end);
20 20
21Egraph_Targettrack *egraph_targettrack_multi(Evas_Object *obj, Evas_Object *origin, Eina_List *targets, Ecore_Pos_Map map, int total_time, Egraph_Targettrack_End_Cb cb_end); 21Egraph_Targettrack *egraph_targettrack_multi(Evas_Object *obj, Evas_Object *origin, Eina_List *targets, Ecore_Pos_Map map, double total_time, Egraph_Targettrack_End_Cb cb_end);