Changeset 446

Timestamp:

03/04/2008 01:46:17 (6 months ago)

Author:

why

Message:

• shoes/canvas.c: append, prepend, clear. these altering methods had an issue with adding elements in url-style apps. the toplevel slot needs to be added to the nesting before drawing. (spotted by the_hack in ticket #63.)
  

Location:

trunk/shoes

Files:

• app.c (modified) (4 diffs)
• app.h (modified) (1 diff)
• canvas.c (modified) (1 diff)

trunk/shoes/app.c

@@ -23 +23 @@
   rb_gc_mark_maybe(app->location);
   rb_gc_mark_maybe(app->canvas);
+  rb_gc_mark_maybe(app->nestslot);
   rb_gc_mark_maybe(app->nesting);
   rb_gc_mark_maybe(app->timers);
@@ -41 +42 @@
   app->location = Qnil;
   app->canvas = shoes_canvas_new(cShoes, app);
+  app->nestslot = Qnil;
   app->nesting = rb_ary_new();
   app->timers = rb_ary_new();
@@ -74 +76 @@
   shoes_ele_remove_all(app->timers);
   shoes_canvas_clear(app->canvas);
+  app->nestslot = Qnil;
 }
 
@@ -1805 +1808 @@
   if (rb_obj_is_kind_of(exec.block, rb_cUnboundMethod)) {
     VALUE klass = rb_unbound_get_class(exec.block);
-    exec.canvas = shoes_slot_new(klass, Qnil, app->canvas);
+    exec.canvas = app->nestslot = shoes_slot_new(klass, Qnil, app->canvas);
     exec.block = rb_funcall(exec.block, s_bind, 1, exec.canvas);
     exec.ieval = 0;
     rb_ary_push(canvas->contents, exec.canvas);
   } else {
-    exec.canvas = app->canvas;
+    exec.canvas = app->nestslot = app->canvas;
     exec.ieval = 1;
   }

trunk/shoes/app.h

@@ -34 +34 @@
   VALUE self;
   VALUE canvas;
+  VALUE nestslot;
   VALUE nesting;
   VALUE timers;

trunk/shoes/canvas.c

@@ -1493 +1493 @@
 
 #define DRAW(c, app, blk) \
-  rb_ary_push(app->nesting, c); \
-  rb_funcall(blk, s_call, 0); \
-  rb_ary_pop(app->nesting)
+  { \
+    unsigned char alter = 0; \
+    if (RARRAY_LEN(app->nesting) == 0) \
+    { \
+      alter = 1; \
+      rb_ary_push(app->nesting, app->nestslot); \
+    } \
+    rb_ary_push(app->nesting, c); \
+    rb_funcall(blk, s_call, 0); \
+    rb_ary_pop(app->nesting); \
+    if (alter) \
+      rb_ary_pop(app->nesting); \
+  }
+
 
 static void