handle table center/right alignment

ArthurHub · ArthurHub · commit 103232bbba4c · 2014-09-20T13:55:57.000+03:00
diff --git a/Source/Demo/Common/Samples/03.Tables.htm b/Source/Demo/Common/Samples/03.Tables.htm
@@ -283,29 +283,31 @@ <h2>
             </table>
             <p>
             </p>
-            <table border="10" cellspacing="0">
-                <tr>
-                    <td rowspan="2">
-                        Cell One
-                    </td>
-                    <td colspan="2">
-                        Cell Two
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        Cell Five
-                    </td>
-                    <td rowspan="2">
-                        Cell Six
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="2">
-                        Cell Seven
-                    </td>
-                </tr>
-            </table>
+            <div align="center">
+                <table border="10" cellspacing="0">
+                    <tr>
+                        <td rowspan="2">
+                            Cell One
+                        </td>
+                        <td colspan="2">
+                            Cell Two
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            Cell Five
+                        </td>
+                        <td rowspan="2">
+                            Cell Six
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="2">
+                            Cell Seven
+                        </td>
+                    </tr>
+                </table>
+            </div>
             <p>
             </p>
         </blockquote>
diff --git a/Source/HtmlRenderer/Core/Dom/CssLayoutEngineTable.cs b/Source/HtmlRenderer/Core/Dom/CssLayoutEngineTable.cs
@@ -613,6 +613,17 @@ private void LayoutCells(RGraphics g)
             double maxBottom = 0f;
             int currentrow = 0;
 
+            // change start X by if the table should align to center or right
+            if (_tableBox.TextAlign == CssConstants.Center || _tableBox.TextAlign == CssConstants.Right)
+            {
+                double maxRightCalc = GetWidthSum();
+                startx = _tableBox.TextAlign == CssConstants.Right
+                    ? GetAvailableTableWidth() - maxRightCalc
+                    : startx + (GetAvailableTableWidth() - maxRightCalc) / 2;
+
+                _tableBox.Location = new RPoint(startx - _tableBox.ActualBorderLeftWidth - _tableBox.ActualPaddingLeft - GetHorizontalSpacing(), _tableBox.Location.Y);
+            }
+
             for (int i = 0; i < _allRows.Count; i++)
             {
                 var row = _allRows[i];
