From 2e8be21a4d0a7443e421b087f3500f2d65fd0bf1 Mon Sep 17 00:00:00 2001 From: Tebjan Halm Date: Wed, 28 Dec 2016 20:05:40 +0100 Subject: [PATCH] Revert "Fix #176: Blurry text when overlapped with colored background" --- Samples/SVGViewer/DebugRenderer.cs | 6 +----- Source/Rendering/ISvgRenderer.cs | 1 - Source/Rendering/SvgRenderer.cs | 6 +----- Source/Text/SvgTextBase.cs | 7 ------- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/Samples/SVGViewer/DebugRenderer.cs b/Samples/SVGViewer/DebugRenderer.cs index b5321a093..48bbe3378 100644 --- a/Samples/SVGViewer/DebugRenderer.cs +++ b/Samples/SVGViewer/DebugRenderer.cs @@ -93,11 +93,7 @@ public void TranslateTransform(float dx, float dy, MatrixOrder order = MatrixOrd _transform.Translate(dx, dy, order); } - public CompositingMode CompositingMode - { - get { return System.Drawing.Drawing2D.CompositingMode.SourceOver; /* default value */ } - set { /* Do Nothing */ } - } + public SmoothingMode SmoothingMode { diff --git a/Source/Rendering/ISvgRenderer.cs b/Source/Rendering/ISvgRenderer.cs index a00a56332..b291f470f 100644 --- a/Source/Rendering/ISvgRenderer.cs +++ b/Source/Rendering/ISvgRenderer.cs @@ -19,7 +19,6 @@ public interface ISvgRenderer : IDisposable void ScaleTransform(float sx, float sy, MatrixOrder order = MatrixOrder.Append); void SetBoundable(ISvgBoundable boundable); void SetClip(Region region, CombineMode combineMode = CombineMode.Replace); - CompositingMode CompositingMode { get; set; } SmoothingMode SmoothingMode { get; set; } Matrix Transform { get; set; } void TranslateTransform(float dx, float dy, MatrixOrder order = MatrixOrder.Append); diff --git a/Source/Rendering/SvgRenderer.cs b/Source/Rendering/SvgRenderer.cs index 39b06531a..6d5fbde47 100644 --- a/Source/Rendering/SvgRenderer.cs +++ b/Source/Rendering/SvgRenderer.cs @@ -79,11 +79,7 @@ public void TranslateTransform(float dx, float dy, MatrixOrder order = MatrixOrd this._innerGraphics.TranslateTransform(dx, dy, order); } - public CompositingMode CompositingMode - { - get { return this._innerGraphics.CompositingMode; } - set { this._innerGraphics.CompositingMode = value; } - } + public SmoothingMode SmoothingMode { diff --git a/Source/Text/SvgTextBase.cs b/Source/Text/SvgTextBase.cs index aed565ee3..98acf1d7f 100644 --- a/Source/Text/SvgTextBase.cs +++ b/Source/Text/SvgTextBase.cs @@ -259,11 +259,6 @@ protected override void Render(ISvgRenderer renderer) renderer.SmoothingMode = SmoothingMode.AntiAlias; } - // If text color blends with background color, text will be rendered blurry - // To avoid it, we set SourceCopy which overwrite background color - var compositingMode = renderer.CompositingMode; - renderer.CompositingMode = CompositingMode.SourceCopy; - this.RenderFill(renderer); this.RenderStroke(renderer); this.RenderChildren(renderer); @@ -274,8 +269,6 @@ protected override void Render(ISvgRenderer renderer) renderer.SmoothingMode = SmoothingMode.Default; } - renderer.CompositingMode = compositingMode; - this.ResetClip(renderer); this.PopTransforms(renderer); }