Merge pull request #3575 from SamBent/FixedPageOverlap

FixedPage SOM bugs
dotnet · Oct 7, 2020 · ab605d1 · ab605d1
2 parents f84d22a + bf4c466
commit ab605d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/....DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FixedSOMPageConstructor.cs b/....DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FixedSOMPageConstructor.cs
@@ -717,13 +717,15 @@ private bool _IsCombinable(FixedSOMFixedBlock fixedBlock, FixedSOMTextRun textRu
                 //These two overlap vertically. Let's check whether there is a vertical separator in between
                 double left = (fixedBlockRect.Right < textRunRect.Right) ? fixedBlockRect.Right: textRunRect.Right;
                 double right =(fixedBlockRect.Left > textRunRect.Left) ? fixedBlockRect.Left: textRunRect.Left;
-                if (left > right)
+                if (left < right)
                 {
-                    double temp = left;
-                    left = right;
-                    right = temp;
+                    return (!_lines.IsVerticallySeparated(left, textRunRect.Top, right, textRunRect.Bottom));
+                }
+                else
+                {
+                    // they also overlap horizontally, so they should be combined
+                    return true;
                 }
-                return (!_lines.IsVerticallySeparated(left, textRunRect.Top, right, textRunRect.Bottom));
             }
         }
 

diff --git a/...crosoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FixedTextBuilder.cs b/...crosoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Documents/FixedTextBuilder.cs
@@ -1033,7 +1033,7 @@ Matrix transform
                                 newPathPrefix,         // otherwise use this path prefix
                                 constructLines,
                                 fixedNodes,
-                                transform * localTransform.Value
+                                localTransform.Value * transform
                                 );
                     }//endofElementIsCanvas
                 }