Changeset 483

Timestamp:

03/15/2008 13:43:54 (5 months ago)

Author:

why

Message:

• shoes/ruby.c: starting to address the flow problems described in ticket #99. removed marginy from shoes_canvas and starting to use the max endy. so the rules are: margins no longer overlap and biggest element wins.
  
• shoes/app.c: gtk wasn't repainting on resize. tied to the resize-allocate event now, which works.
  

Location:

trunk/shoes

Files:

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

trunk/shoes/app.c

@@ -1536 +1536 @@
   g_signal_connect(G_OBJECT(gk->window), "expose-event",
                    G_CALLBACK(shoes_app_gtk_paint), app);
+  g_signal_connect(G_OBJECT(gk->window), "size-allocate",
+                   G_CALLBACK(shoes_app_gtk_paint), app);
   g_signal_connect(G_OBJECT(gk->window), "motion-notify-event", 
                    G_CALLBACK(shoes_app_gtk_motion), app);

trunk/shoes/canvas.c

@@ -432 +432 @@
   canvas->cx = 0;
   canvas->cy = 0;
-  canvas->marginy = 0;
   canvas->endy = 0;
   canvas->endx = 0;
@@ -1177 +1176 @@
   self_t->cx = self_t->place.ix;
   self_t->cy = self_t->place.iy;
-  self_t->marginy = 0;
   self_t->endx = self_t->place.ix;
   self_t->endy = self_t->place.iy;
@@ -1225 +1223 @@
     self_t->endx = self_t->cx = 0;
     self_t->topy = self_t->endy = self_t->cy = 0;
-    self_t->marginy = 0;
     if (!NIL_P(self_t->parent))
     {
@@ -1338 +1335 @@
           self_t->cy = c1->place.y;
           self_t->endx = self_t->cx;
-          self_t->endy = c1->place.y + c1->place.h;
+          self_t->endy = max(self_t->endy, c1->place.y + c1->place.h);
         }
         if (ck == cStack) {

trunk/shoes/canvas.h

@@ -227 +227 @@
   double sw;                // current stroke-width
   int cx, cy;               // cursor x and y (stored in absolute coords)
-  int marginy;              // value for next y-margin
   int endx, endy;           // jump points if the cursor spills over
   int topy, fully;          // since we often stack vertically

trunk/shoes/ruby.c

@@ -384 +384 @@
       canvas->cx = place->x = CPX(canvas);
       canvas->cy = place->y = canvas->endy;
-      canvas->marginy = bmargin;
     }
   }
@@ -392 +391 @@
   place->iw = place->w - (lmargin + rmargin);
   place->ih = place->h - (tmargin + bmargin);
-  INFO("PLACE: (%d, %d), (%d, %d) [%d, %d] %d %x\n", place->x, place->y, place->w, place->h, ABSX(*place), ABSY(*place), place->flags, canvas->marginy);
+  INFO("PLACE: (%d, %d), (%d, %d) [%d, %d] %x\n", place->x, place->y, place->w, place->h, ABSX(*place), ABSY(*place), place->flags);
 }
 
@@ -490 +489 @@
     canvas->cy = self_t->place.y; \
     canvas->endx = canvas->cx; \
-    canvas->endy = self_t->place.y + self_t->place.h; \
+    canvas->endy = max(canvas->endy, self_t->place.y + self_t->place.h); \
   } \
   if (ck == cStack) { \
@@ -2413 +2412 @@
     {
       self_t->place.x = CPX(canvas);
-      self_t->place.y = canvas->endy;
+      canvas->cy = self_t->place.y = canvas->endy;
     }
     else
@@ -2445 +2444 @@
       pango_layout_set_indent(self_t->layout, 0);
       self_t->place.x = CPX(canvas);
-      self_t->place.y = canvas->endy;
+      canvas->cy = self_t->place.y = canvas->endy;
       pd = 0;
     }
@@ -2451 +2450 @@
       self_t->place.y = ((canvas->endy - ld) - lrect.height);
   }
-  if (!ABSY(self_t->place) && !ABSX(self_t->place) && !pd)
-    tmargin = max(tmargin, canvas->marginy);
   self_t->place.ix = self_t->place.x + lmargin;
   self_t->place.iy = self_t->place.y + tmargin;
@@ -2498 +2495 @@
     self_t->place.y, self_t->place.iy, self_t->place.w, self_t->place.h, pd);
 
+  int endy = 0;
   if (!ABSY(self_t->place)) {
     // newlines have an empty size
     if (ck != cStack) {
       if (li == 0) {
-        canvas->endy = self_t->place.y;
+        endy = self_t->place.y;
         canvas->cx = self_t->place.x + lrect.x + lrect.width + rmargin + pd;
       } else {
-        canvas->endy = self_t->place.y + py - lrect.height;
+        endy = self_t->place.y + py - lrect.height;
         if (lrect.width == 0) {
           canvas->cx = self_t->place.x + lrect.x;
@@ -2511 +2509 @@
           canvas->cx = self_t->place.x + lrect.width + rmargin;
         }
-        canvas->cy = canvas->endy;
+        canvas->cy = endy;
       }
     } else {
-      canvas->endy = self_t->place.y + self_t->place.h;
-    }
+      endy = self_t->place.y + self_t->place.h;
+    }
+
+    canvas->endy = max(endy, canvas->endy);
+    canvas->endx = canvas->cx;
+
     if (ck == cStack || canvas->cx - CPX(canvas) > canvas->width) {
       canvas->cx = CPX(canvas);
@@ -2523 +2525 @@
       bmargin = lrect.height;
 
-    if (!pd)
-      canvas->marginy = bmargin;
-    else
-      canvas->marginy = max(canvas->marginy, bmargin);
-    canvas->endx = canvas->cx;
-
-    INFO("CX: (%d, %d) / LRECT: (%d, %d) / END: (%d, %d) %d\n", 
+    INFO("CX: (%d, %d) / LRECT: (%d, %d) / END: (%d, %d)\n", 
       canvas->cx, canvas->cy,
       lrect.x, lrect.width,
-      canvas->endx, canvas->endy, canvas->marginy);
+      canvas->endx, canvas->endy);
   }
   return self;