fix right and center align glyph padding (https://htmlrenderer.codeplex.com/discussions/458875)

ArthurHub · ArthurHub · commit a7adee1c739f · 2013-09-24T16:09:53.000+03:00
diff --git a/Source/Demo/TestSamples/12.Text.htm b/Source/Demo/TestSamples/12.Text.htm
@@ -2,6 +2,14 @@
 <head>
     <title>Text</title>
     <link rel="Stylesheet" href="StyleSheet" />
+    <style>
+        .right {
+            text-align: right;
+            border-width: 1px;
+            border-style: solid;
+            border-color: blue;
+        }
+    </style>
 </head>
 <body>
     <h2>Case 1</h2>
@@ -14,10 +22,20 @@ <h2>Text align justify with background colors</h2>
     <p style="text-align: justify">
         <div>
             Lorem ipsum dolor sit amet, <span style="background-color: gold;">consectetur</span> adipisicing
-        elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua tempor incididunt ut labore et dolore magna aliqua incididunt ut labore et dolore magna aliqua.
+            elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua tempor incididunt ut labore et dolore magna aliqua incididunt ut labore et dolore magna aliqua.
         </div>
     </p>
     <hr />
+    <h2>Right align adjusts</h2>
+    <table style="border-spacing: 0px;">
+        <tr>
+            <td class="right">978</td>
+        </tr>
+        <tr>
+            <td class="right">32</td>
+        </tr>
+    </table>
+    <hr />
     <h2>Transparent text</h2>
     <p style="color: rgba(255,0,0,100)">
         Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur ornare mollis elit. Integer sagittis. Fusce elementum commodo felis. Vivamus lacinia eleifend libero. Donec 
diff --git a/Source/HtmlRenderer/Dom/CssLayoutEngine.cs b/Source/HtmlRenderer/Dom/CssLayoutEngine.cs
@@ -611,20 +611,21 @@ private static void ApplyCenterAlignment(IGraphics g, CssLineBox line)
 
             CssRect lastWord = line.Words[line.Words.Count - 1];
             float right = line.OwnerBox.ActualRight - line.OwnerBox.ActualPaddingRight - line.OwnerBox.ActualBorderRightWidth;
-            float diff = right - lastWord.Right - lastWord.LeftGlyphPadding - lastWord.OwnerBox.ActualBorderRightWidth - lastWord.OwnerBox.ActualPaddingRight;
+            float diff = right - lastWord.Right - lastWord.OwnerBox.ActualBorderRightWidth - lastWord.OwnerBox.ActualPaddingRight;
             diff /= 2;
 
-            if (diff <= 0) return;
-
-            foreach (CssRect word in line.Words)
+            if (diff > 0)
             {
-                word.Left += diff;
-            }
+                foreach (CssRect word in line.Words)
+                {
+                    word.Left += diff;
+                }
 
-            foreach (CssBox b in line.Rectangles.Keys)
-            {
-                RectangleF r = b.Rectangles[line];
-                b.Rectangles[line] = new RectangleF(r.X + diff, r.Y, r.Width, r.Height);
+                foreach (CssBox b in line.Rectangles.Keys)
+                {
+                    RectangleF r = b.Rectangles[line];
+                    b.Rectangles[line] = new RectangleF(r.X + diff, r.Y, r.Width, r.Height);
+                }
             }
         }
 
@@ -640,25 +641,20 @@ private static void ApplyRightAlignment(IGraphics g, CssLineBox line)
 
             CssRect lastWord = line.Words[line.Words.Count - 1];
             float right = line.OwnerBox.ActualRight - line.OwnerBox.ActualPaddingRight - line.OwnerBox.ActualBorderRightWidth;
-            float diff = right - lastWord.Right - lastWord.LeftGlyphPadding - lastWord.OwnerBox.ActualBorderRightWidth - lastWord.OwnerBox.ActualPaddingRight;
-
+            float diff = right - lastWord.Right - lastWord.OwnerBox.ActualBorderRightWidth - lastWord.OwnerBox.ActualPaddingRight;
 
-            if (diff <= 0) return;
-
-            //if (line.OwnerBox.Direction == CssConstants.Rtl)
-            //{
-
-            //}
-
-            foreach (CssRect word in line.Words)
+            if (diff > 0)
             {
-                word.Left += diff;
-            }
+                foreach (CssRect word in line.Words)
+                {
+                    word.Left += diff;
+                }
 
-            foreach (CssBox b in line.Rectangles.Keys)
-            {
-                RectangleF r = b.Rectangles[line];
-                b.Rectangles[line] = new RectangleF(r.X + diff, r.Y, r.Width, r.Height);
+                foreach (CssBox b in line.Rectangles.Keys)
+                {
+                    RectangleF r = b.Rectangles[line];
+                    b.Rectangles[line] = new RectangleF(r.X + diff, r.Y, r.Width, r.Height);
+                }
             }
         }
 
