Merge pull request ArthurHub#98 from ArthurHub/revert-62-bugfix/wpf-blurry-text-render

Licshee · web-flow · commit e0a2d1702aae · 2017-08-11T15:42:13.000+08:00
Revert "Fixes WPF text blurry render encountered in some cases."
diff --git a/Source/HtmlRenderer.WPF/Adapters/GraphicsAdapter.cs b/Source/HtmlRenderer.WPF/Adapters/GraphicsAdapter.cs
@@ -201,15 +201,7 @@ public override void DrawString(string str, RFont font, RColor color, RPoint poi
 
                     glyphRendered = true;
                     var glyphRun = new GlyphRun(glyphTypeface, rtl ? 1 : 0, false, 96d / 72d * font.Size, glyphs, Utils.ConvertRound(point), widths, null, null, null, null, null, null);
-                    var rect = glyphRun.ComputeAlignmentBox();
-                    var guidelines = new GuidelineSet();
-                    guidelines.GuidelinesX.Add(rect.Left);
-                    guidelines.GuidelinesX.Add(rect.Right);
-                    guidelines.GuidelinesY.Add(rect.Top);
-                    guidelines.GuidelinesY.Add(rect.Bottom);
-                    _g.PushGuidelineSet(guidelines);
                     _g.DrawGlyphRun(colorConv, glyphRun);
-                    _g.Pop();
                 }
             }
 
@@ -277,7 +269,7 @@ public override void DrawRectangle(RPen pen, double x, double y, double width, d
                 x += .5;
                 y += .5;
             }
-
+            
             _g.DrawRectangle(null, ((PenAdapter)pen).CreatePen(), new Rect(x, y, width, height));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -201,15 +201,7 @@ public override void DrawString(string str, RFont font, RColor color, RPoint poi`
`201`	`201`
`202`	`202`	`glyphRendered = true;`
`203`	`203`	`var glyphRun = new GlyphRun(glyphTypeface, rtl ? 1 : 0, false, 96d / 72d * font.Size, glyphs, Utils.ConvertRound(point), widths, null, null, null, null, null, null);`
`204`		`- var rect = glyphRun.ComputeAlignmentBox();`
`205`		`- var guidelines = new GuidelineSet();`
`206`		`- guidelines.GuidelinesX.Add(rect.Left);`
`207`		`- guidelines.GuidelinesX.Add(rect.Right);`
`208`		`- guidelines.GuidelinesY.Add(rect.Top);`
`209`		`- guidelines.GuidelinesY.Add(rect.Bottom);`
`210`		`- _g.PushGuidelineSet(guidelines);`
`211`	`204`	`_g.DrawGlyphRun(colorConv, glyphRun);`
`212`		`- _g.Pop();`
`213`	`205`	`}`
`214`	`206`	`}`
`215`	`207`
`@@ -277,7 +269,7 @@ public override void DrawRectangle(RPen pen, double x, double y, double width, d`
`277`	`269`	`x += .5;`
`278`	`270`	`y += .5;`
`279`	`271`	`}`
`280`		`-`
	`272`	`+`
`281`	`273`	`_g.DrawRectangle(null, ((PenAdapter)pen).CreatePen(), new Rect(x, y, width, height));`
`282`	`274`	`}`
`283`	`275`