Drop some unused code and values (ForNeVeR#100)

B3zaleel · Aug 11, 2019 · 10639a5 · 10639a5
1 parent b511180
commit 10639a5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/src/WpfMath.Tests/TestResults/BoxTests.casesBox.approved.txt b/src/WpfMath.Tests/TestResults/BoxTests.casesBox.approved.txt
@@ -152,7 +152,7 @@
           "Source": null,
           "Foreground": null,
           "Background": null,
-          "Tag": "Row:0",
+          "Tag": null,
           "TotalHeight": 0.78055500000000011,
           "TotalWidth": 0.87859,
           "Italic": 0.0,
@@ -269,7 +269,7 @@
           "Source": null,
           "Foreground": null,
           "Background": null,
-          "Tag": "Row:1",
+          "Tag": null,
           "TotalHeight": 1.044445,
           "TotalWidth": 0.87859,
           "Italic": 0.0,
@@ -386,7 +386,7 @@
           "Source": null,
           "Foreground": null,
           "Background": null,
-          "Tag": "Row:2",
+          "Tag": null,
           "TotalHeight": 0.78055500000000011,
           "TotalWidth": 0.87859,
           "Italic": 0.0,

diff --git a/src/WpfMath.Tests/TestResults/BoxTests.nestedMatrixBox.approved.txt b/src/WpfMath.Tests/TestResults/BoxTests.nestedMatrixBox.approved.txt
@@ -312,7 +312,7 @@
       "Source": null,
       "Foreground": null,
       "Background": null,
-      "Tag": "Row:0",
+      "Tag": null,
       "TotalHeight": 0.99444400000000011,
       "TotalWidth": 2.9000059999999994,
       "Italic": 0.0,
@@ -565,7 +565,7 @@
                   "Source": null,
                   "Foreground": null,
                   "Background": null,
-                  "Tag": "Row:0",
+                  "Tag": null,
                   "TotalHeight": 0.99444400000000011,
                   "TotalWidth": 0.85000199999999992,
                   "Italic": 0.0,
@@ -682,7 +682,7 @@
                   "Source": null,
                   "Foreground": null,
                   "Background": null,
-                  "Tag": "Row:1",
+                  "Tag": null,
                   "TotalHeight": 0.99444400000000011,
                   "TotalWidth": 0.85000199999999992,
                   "Italic": 0.0,
@@ -856,7 +856,7 @@
       "Source": null,
       "Foreground": null,
       "Background": null,
-      "Tag": "Row:1",
+      "Tag": null,
       "TotalHeight": 2.338888,
       "TotalWidth": 2.9000059999999994,
       "Italic": 0.0,

diff --git a/src/WpfMath.Tests/TestResults/BoxTests.simpleMatrixBox.approved.txt b/src/WpfMath.Tests/TestResults/BoxTests.simpleMatrixBox.approved.txt
@@ -254,7 +254,7 @@
           "Source": null,
           "Foreground": null,
           "Background": null,
-          "Tag": "Row:0",
+          "Tag": null,
           "TotalHeight": 0.99444400000000011,
           "TotalWidth": 1.7000039999999998,
           "Italic": 0.0,
@@ -473,7 +473,7 @@
           "Source": null,
           "Foreground": null,
           "Background": null,
-          "Tag": "Row:1",
+          "Tag": null,
           "TotalHeight": 0.99444400000000011,
           "TotalWidth": 1.7000039999999998,
           "Italic": 0.0,

diff --git a/src/WpfMath.Tests/TestResults/BoxTests.wideItemInMatrixBox.approved.txt b/src/WpfMath.Tests/TestResults/BoxTests.wideItemInMatrixBox.approved.txt
@@ -519,7 +519,7 @@
               "Source": null,
               "Foreground": null,
               "Background": null,
-              "Tag": "Row:0",
+              "Tag": null,
               "TotalHeight": 1.0166680000000001,
               "TotalWidth": 7.0991643999999994,
               "Italic": 0.0,
@@ -1269,7 +1269,7 @@
               "Source": null,
               "Foreground": null,
               "Background": null,
-              "Tag": "Row:1",
+              "Tag": null,
               "TotalHeight": 1.4640028,
               "TotalWidth": 7.0991643999999994,
               "Italic": 0.0,

diff --git a/src/WpfMath/Atoms/MatrixAtom.cs b/src/WpfMath/Atoms/MatrixAtom.cs
@@ -55,10 +55,9 @@ protected override Box CreateBoxCore(TexEnvironment environment)
                 rowsContainer.Add(row);
             }
 
-            rowsContainer.Depth = rowsContainer.Height / 2;
             ApplyCellSizes(rowBoxes, matrixCellGaps);
 
-            var adjustedWidth = rowBoxes.Max(r => r.Width);
+            var adjustedWidth = rowBoxes.Max(r => r.TotalWidth);
             var adjustedHeight = rowHeights.Sum();
 
             rowsContainer.Depth = adjustedHeight / 2;
@@ -79,7 +78,7 @@ private HorizontalBox CreateRowBox(
             // TODO[F]: remove rowIndex parameter altogether with Tags
             // TODO[F]: remove rowHeights and colunmWidths arguments (calculate them outside)
             // TODO[F]: return IEnumerable<Box> from here and make the outside code to control the paddings
-            var rowBox = new HorizontalBox {Tag = $"Row:{rowIndex}",};
+            var rowBox = new HorizontalBox();
 
             for (int j = 0; j < maxColumnCount; j++)
             {