Changeset 487

Timestamp:

03/16/2008 16:58:37 (6 months ago)

Author:

why

Message:

• shoes/ruby.c: simplifying text flowing. as with elements: largest font wins. still need to get all text to match a common baseline.
  

Files:

• trunk/shoes/ruby.c (modified) (3 diffs)

trunk/shoes/ruby.c

@@ -2447 +2447 @@
       pd = 0;
     }
-    else if (((canvas->endy - ld) - lrect.height) > canvas->cy && self_t->place.y < canvas->endy)
-      self_t->place.y = ((canvas->endy - ld) - lrect.height);
   }
   self_t->place.ix = self_t->place.x + lmargin;
@@ -2495 +2493 @@
     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) {
-        endy = self_t->place.y;
         canvas->cx = self_t->place.x + lrect.x + lrect.width + rmargin + pd;
       } else {
-        endy = self_t->place.y + py - lrect.height;
+        canvas->cy = self_t->place.y + py - lrect.height;
         if (lrect.width == 0) {
           canvas->cx = self_t->place.x + lrect.x;
@@ -2509 +2505 @@
           canvas->cx = self_t->place.x + lrect.width + rmargin;
         }
-        canvas->cy = endy;
       }
-    } else {
-      endy = self_t->place.y + self_t->place.h;
-    }
-
-    canvas->endy = max(endy, canvas->endy);
+    }
+
+    canvas->endy = max(self_t->place.y + self_t->place.h, canvas->endy);
     canvas->endx = canvas->cx;