From 66bcb0fb572c419b8b1a775d07509b9c755ed960 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Thu, 19 Jun 2003 15:02:21 +0000
Subject: [PATCH] 1 copy & paste bug in edje_cc. fixed non animated programs

SVN revision: 7045
---
 legacy/edje/data/src/e_logo.edc     | 19 +++++-----
 legacy/edje/src/bin/edje_cc_parse.c |  4 +-
 legacy/edje/src/lib/edje_main.c     | 57 ++++++++++++++++++++---------
 3 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/legacy/edje/data/src/e_logo.edc b/legacy/edje/data/src/e_logo.edc
index fd9184b69c..f8991e97b1 100644
--- a/legacy/edje/data/src/e_logo.edc
+++ b/legacy/edje/data/src/e_logo.edc
@@ -147,11 +147,11 @@ collections {
 	       border, 12 12 12 12;
 	    }
 	 }
-/*	 
 	 part {
 	    name,          "logo";
 	    description {
 	       state,    "default" 0.0;
+	       min,      64 64;
 	       max,      320 320;
 	       aspect,   1.0 1.0;
 	       rel1 {
@@ -159,8 +159,8 @@ collections {
 		  offset,   16   16;
 	       }
 	       rel2 {
-		  relative, 1.0  1.0;
-		  offset,   -17  -17;
+		  relative, 0.3  0.3;
+		  offset,   15  16;
 	       }
 	       image {
 		  normal, "e.png";
@@ -168,21 +168,22 @@ collections {
 	    }
 	    description {
 	       state,    "clicked" 0.0;
-	       max,      16 16;
+	       min,      48 48;
+	       max,      280 280;
+	       aspect,   1.0 1.0;
 	       rel1 {
 		  relative, 0.0  0.0;
-		  offset,   16   16;
+		  offset,   20   20;
 	       }
 	       rel2 {
-		  relative, 1.0  1.0;
-		  offset,   -17  -17;
+		  relative, 0.3  0.3;
+		  offset,   12  12;
 	       }
 	       image {
 		  normal, "e.png";
 	       }
 	    }
 	 }
- */
 	 part {
 	    name,          "logo_anim";
 	    description {
@@ -323,7 +324,6 @@ collections {
 	 }
       }
       programs {
-/*	 
 	 program {
 	    name,       "logo_click";
 	    signal,     "mouse,down,1";
@@ -338,7 +338,6 @@ collections {
 	    action,     STATE_SET "default" 0.0;
 	    target,     "logo";
 	 }
- */
 	 program {
 	    name,       "logo_animate";
 	    signal,     "load";
diff --git a/legacy/edje/src/bin/edje_cc_parse.c b/legacy/edje/src/bin/edje_cc_parse.c
index 6b347d81b8..c5535fb4fb 100644
--- a/legacy/edje/src/bin/edje_cc_parse.c
+++ b/legacy/edje/src/bin/edje_cc_parse.c
@@ -487,10 +487,10 @@ parse_float_range(int n, int f, int t)
 		progname, file_in, line, n + 1);
 	exit(-1);	
      }
-   i = atoi(str);
+   i = atof(str);
    if ((i < f) || (i > t))
      {
-	fprintf(stderr, "%s: Error. %s:%i integer %i out of range of %i to %i inclusive\n",
+	fprintf(stderr, "%s: Error. %s:%i integer %i out of range of %3.3f to %3.3f inclusive\n",
 		progname, file_in, line, i, f, t);
 	exit(-1);
      }
diff --git a/legacy/edje/src/lib/edje_main.c b/legacy/edje/src/lib/edje_main.c
index c2a60200a4..988e77dc5a 100644
--- a/legacy/edje/src/lib/edje_main.c
+++ b/legacy/edje/src/lib/edje_main.c
@@ -426,7 +426,7 @@ _edje_mouse_up_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
    ed = data;
    rp = evas_object_data_get(obj, "real_part");
    if (!rp) return;
-   snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
+   snprintf(buf, sizeof(buf), "mouse,up,%i", ev->button);
    _edje_emit(ed, buf, rp->part->name);
 }
 
@@ -559,27 +559,28 @@ _edje_program_run(Edje *ed, Edje_Program *pr)
 {
    Evas_List *l;
 
-   for (l = pr->targets; l; l = l->next)
-     {
-	Edje_Real_Part *rp;
-	Edje_Program_Target *pt;
-	
-	pt = l->data;
-	rp = evas_list_nth(ed->parts, pt->id);
-	if (rp)
-	  {
-	     _edje_part_description_apply(ed, rp, 
-					  rp->param1.description->state.name,
-					  rp->param1.description->state.value, 
-					  pr->state, 
-					  pr->value);
-	     _edje_part_pos_set(ed, rp, pr->tween.mode, 0.0);
-	  }
-     }
    _edje_emit(ed, "anim,start", pr->name);
    if (pr->tween.time > 0.0)
      {
 	Edje_Running_Program *runp;
+
+	for (l = pr->targets; l; l = l->next)
+	  {
+	     Edje_Real_Part *rp;
+	     Edje_Program_Target *pt;
+	     
+	     pt = l->data;
+	     rp = evas_list_nth(ed->parts, pt->id);
+	     if (rp)
+	       {
+		  _edje_part_description_apply(ed, rp, 
+					       rp->param1.description->state.name,
+					       rp->param1.description->state.value, 
+					       pr->state, 
+					       pr->value);
+		  _edje_part_pos_set(ed, rp, pr->tween.mode, 0.0);
+	       }
+	  }
 	
 	runp = calloc(1, sizeof(Edje_Running_Program));
 	if (!ed->actions)
@@ -592,6 +593,26 @@ _edje_program_run(Edje *ed, Edje_Program *pr)
 	  _edje_timer = ecore_timer_add(_edje_frametime, _edje_timer_cb, NULL);
 	_edje_anim_count++;
      }
+   else
+     {
+	for (l = pr->targets; l; l = l->next)
+	  {
+	     Edje_Real_Part *rp;
+	     Edje_Program_Target *pt;
+	     
+	     pt = l->data;
+	     rp = evas_list_nth(ed->parts, pt->id);
+	     if (rp)
+	       {
+		  _edje_part_description_apply(ed, rp, 
+					       pr->state, 
+					       pr->value,
+					       NULL,
+					       0.0);
+		  _edje_part_pos_set(ed, rp, pr->tween.mode, 0.0);
+	       }
+	  }
+     }
 }
 
 static void