Changeset 764

Timestamp:

01/13/08 19:00:12 (6 months ago)

Author:

astrange

Message:

Fix misaligned SSA multi-line toptitles. Closes #280 for now.

Files:

• branches/perian-1.1/Subtitles/SubATSUIRenderer.m (modified) (6 diffs)

branches/perian-1.1/Subtitles/SubATSUIRenderer.m

@@ -541 +541 @@
-}
-
-
+extraHeight, Fixed 
-{
-        ATSTrapezoid trap = {0};
@@ -555 +555 @@
-                ATSUGetGlyphBounds(layout, 0, baseY, breaks[i], end-breaks[i], kATSUseDeviceOrigins, 1, &trap, &trapCount);
-
-
+ + extraHeight
-                
-                rect.bottom = MAX(trap.lowerLeft.y, trap.lowerRight.y);
@@ -575 +575 @@
-        *width = largeRect.right - largeRect.left;
-}
+
+#if 0
+static void GetImageBoundingBoxForLayout(ATSUTextLayout layout, UniCharArrayOffset *breaks, ItemCount breakCount, Fixed extraHeight, Fixed *lX, Fixed *lY, Fixed *height, Fixed *width)
+{
+        Rect largeRect = {0};
+        ATSUTextMeasurement baseY = 0;
+        int i;
+        
+        for (i = breakCount; i >= 0; i--) {
+                UniCharArrayOffset end = breaks[i+1];
+                Rect rect;
+                
+                ATSUMeasureTextImage(layout, breaks[i], end-breaks[i], 0, baseY, &rect);
+                
+                baseY += GetLineHeight(layout, breaks[i]) + extraHeight;
+                
+                if (i == breakCount) largeRect = rect;
+                
+                largeRect.bottom = MAX(largeRect.bottom, rect.bottom);
+                largeRect.left = MIN(largeRect.left, rect.left);
+                largeRect.top = MIN(largeRect.top, rect.top);
+                largeRect.right = MAX(largeRect.right, rect.right);
+                        }
+        
+        
+        if (lX) *lX = IntToFixed(largeRect.left);
+        if (lY) *lY = IntToFixed(largeRect.bottom);
+        *height = IntToFixed(largeRect.bottom - largeRect.top);
+        *width = IntToFixed(largeRect.right - largeRect.left);
+}
+#endif
-
-enum {fillc, strokec};
@@ -806 +837 @@
-                ATSUTextMeasurement lineWidth, lineHeight, lineX, lineY;
-                UniCharArrayOffset breaks[2] = {thisBreak, thisBreak + lineLen};
-
+FloatToFixed(spanEx->outlineRadius), 
-                
-                CGRect borderRect = CGRectMake(FixedToFloat(lineX + penX), FixedToFloat(penY - lineY), FixedToFloat(lineWidth), FixedToFloat(lineHeight));
@@ -954 +985 @@
-                ATSUTextMeasurement imageWidth, imageHeight;
-
-
+FloatToFixed(div->styleLine->outlineRadius), 
-
-                if (div->posX == -1) {
@@ -994 +1025 @@
-                        }
-                        
+                        ATSUGetLineControl(layout, kATSUFromTextBeginning, kATSULineDescentTag, sizeof(ATSUTextMeasurement), &descent, NULL);
+
-                        switch (div->alignV) {
-                                case kSubAlignmentMiddle: penY -= imageHeight / 2; break;
-
-
-
-
+
+
-                        
-                        penY += descent;
-
+
-                        SetLayoutPositioning(layout, imageWidth, div->alignH);
-                        storePen = NULL; breakc.lStart = breakCount; breakc.lEnd = -1; breakc.direction = 1;