IGraphics: removed Geometry methods, only keep for D2DGraphics

Author: d2phap

Source/DXControl/Graphics/D2DGraphics.cs

@@ -1,10 +1,9 @@
 /*
 MIT License
-Copyright (C) 2022 DUONG DIEU PHAP
+Copyright (C) 2022 - 2023 DUONG DIEU PHAP
 Project & license info: https://github.com/d2phap/DXControl
 */
 using DirectN;
-using System.Drawing;
 using System.Runtime.InteropServices;
 
 namespace D2Phap;
@@ -303,121 +302,6 @@ public void DrawRectangle(RectangleF rect, float radius, Color borderColor, Colo
     #endregion // Draw/Fill Rectangle
 
 
-    #region Draw / Fill Geometry
-
-    public GeometryObject GetCombinedRectanglesGeometry(RectangleF rect1, RectangleF rect2,
-        float rect1Radius, float rect2Radius, CombineMode combineMode)
-    {
-        // create rounded rectangle 1
-        var roundedRect1 = new D2D1_ROUNDED_RECT()
-        {
-            rect = new D2D_RECT_F(rect1.Left, rect1.Top, rect1.Right, rect1.Bottom),
-            radiusX = rect1Radius,
-            radiusY = rect1Radius,
-        };
-
-        // create rounded rectangle 2
-        var roundedRect2 = new D2D1_ROUNDED_RECT()
-        {
-            rect = new D2D_RECT_F(rect2.Left, rect2.Top, rect2.Right, rect2.Bottom),
-            radiusX = rect2Radius,
-            radiusY = rect2Radius,
-        };
-
-
-        // create geometries
-        var shape1Geo = D2DFactory.CreateRoundedRectangleGeometry(roundedRect1);
-        var shape22Geo = D2DFactory.CreateRoundedRectangleGeometry(roundedRect2);
-
-        // create path geometry to get the combined shape
-        var pathGeo = D2DFactory.CreatePathGeometry();
-        pathGeo.Object.Open(out var pathGeoSink).ThrowOnError();
-
-
-        // combine 2 geometry shapes
-        shape1Geo.Object.CombineWithGeometry(shape22Geo.Object, (D2D1_COMBINE_MODE)combineMode, IntPtr.Zero, 0, pathGeoSink).ThrowOnError();
-
-        pathGeoSink.Close();
-        Marshal.ReleaseComObject(pathGeoSink);
-        shape1Geo.Dispose();
-        shape22Geo.Dispose();
-
-        return new GeometryObject() { D2DGeometry = pathGeo };
-    }
-
-
-    public GeometryObject GetCombinedEllipsesGeometry(RectangleF rect1, RectangleF rect2, CombineMode combineMode)
-    {
-        // create ellipse 1
-        var ellipse1 = new D2D1_ELLIPSE(rect1.X + rect1.Width / 2, rect1.Y + rect1.Height / 2, rect1.Width / 2, rect1.Height / 2);
-
-        // create ellipse 2
-        var ellipse2 = new D2D1_ELLIPSE(rect2.X + rect2.Width / 2, rect2.Y + rect2.Height / 2, rect2.Width / 2, rect2.Height / 2);
-
-
-        // create geometries
-        var shape1Geo = D2DFactory.CreateEllipseGeometry(ellipse1);
-        var shape2Geo = D2DFactory.CreateEllipseGeometry(ellipse2);
-
-        // create path geometry to get the combined shape
-        var pathGeo = D2DFactory.CreatePathGeometry();
-        pathGeo.Object.Open(out var pathGeoSink).ThrowOnError();
-
-
-        // combine 2 geometry shapes
-        shape1Geo.Object.CombineWithGeometry(shape2Geo.Object, (D2D1_COMBINE_MODE)combineMode, IntPtr.Zero, 0, pathGeoSink).ThrowOnError();
-
-        pathGeoSink.Close();
-        Marshal.ReleaseComObject(pathGeoSink);
-        shape1Geo.Dispose();
-        shape2Geo.Dispose();
-
-
-        return new GeometryObject() { D2DGeometry = pathGeo };
-    }
-
-
-    public void DrawGeometry(GeometryObject geoObj, Color borderColor, Color? fillColor = null, float strokeWidth = 1f)
-    {
-        if (geoObj.D2DGeometry is not IComObject<ID2D1Geometry> geometry) return;
-
-        // draw background color -----------------------------------
-        if (fillColor != null)
-        {
-            var bgColor = DXHelper.FromColor(fillColor.Value);
-            var bgBrushStylePtr = new D2D1_BRUSH_PROPERTIES()
-            {
-                opacity = 1f,
-            }.StructureToPtr();
-            DeviceContext.CreateSolidColorBrush(bgColor, bgBrushStylePtr, out var bgBrush);
-
-            // fill the combined geometry
-            DeviceContext.FillGeometry(geometry.Object, bgBrush);
-
-            Marshal.FreeHGlobal(bgBrushStylePtr);
-        }
-
-
-        // draw border color ----------------------------------------
-        if (borderColor != Color.Transparent)
-        {
-            var bdColor = DXHelper.FromColor(borderColor);
-            var borderBrushStylePtr = new D2D1_BRUSH_PROPERTIES()
-            {
-                opacity = 1f,
-            }.StructureToPtr();
-            DeviceContext.CreateSolidColorBrush(bdColor, borderBrushStylePtr, out var borderBrush);
-
-            // draw the combined geometry
-            DeviceContext.DrawGeometry(geometry.Object, borderBrush, strokeWidth);
-
-            Marshal.FreeHGlobal(borderBrushStylePtr);
-        }
-    }
-
-    #endregion // Draw / Fill Geometry
-
-
     #region Draw / Measure text
 
     public void DrawText(string text, string fontFamilyName, float fontSize, float x, float y, Color c, float? textDpi = null, StringAlignment hAlign = StringAlignment.Near, StringAlignment vAlign = StringAlignment.Near, bool isBold = false, bool isItalic = false)
@@ -556,4 +440,134 @@ public void ClearBackground(Color color)
 
     #endregion // Others
 
+
+    // D2DGraphics-only methods
+    #region D2DGraphics-only methods
+
+    #region Draw / Fill Geometry
+
+    /// <summary>
+    /// Get geometry from a combined 2 rectangles.
+    /// </summary>
+    public IComObject<ID2D1Geometry>? GetCombinedRectanglesGeometry(RectangleF rect1, RectangleF rect2,
+        float rect1Radius, float rect2Radius, D2D1_COMBINE_MODE combineMode)
+    {
+        // create rounded rectangle 1
+        var roundedRect1 = new D2D1_ROUNDED_RECT()
+        {
+            rect = new D2D_RECT_F(rect1.Left, rect1.Top, rect1.Right, rect1.Bottom),
+            radiusX = rect1Radius,
+            radiusY = rect1Radius,
+        };
+
+        // create rounded rectangle 2
+        var roundedRect2 = new D2D1_ROUNDED_RECT()
+        {
+            rect = new D2D_RECT_F(rect2.Left, rect2.Top, rect2.Right, rect2.Bottom),
+            radiusX = rect2Radius,
+            radiusY = rect2Radius,
+        };
+
+
+        // create geometries
+        var shape1Geo = D2DFactory.CreateRoundedRectangleGeometry(roundedRect1);
+        var shape22Geo = D2DFactory.CreateRoundedRectangleGeometry(roundedRect2);
+
+        // create path geometry to get the combined shape
+        var pathGeo = D2DFactory.CreatePathGeometry();
+        pathGeo.Object.Open(out var pathGeoSink).ThrowOnError();
+
+
+        // combine 2 geometry shapes
+        shape1Geo.Object.CombineWithGeometry(shape22Geo.Object, combineMode, IntPtr.Zero, 0, pathGeoSink).ThrowOnError();
+
+        pathGeoSink.Close();
+        Marshal.ReleaseComObject(pathGeoSink);
+        shape1Geo.Dispose();
+        shape22Geo.Dispose();
+
+        return pathGeo;
+    }
+
+
+    /// <summary>
+    /// Get geometry from a combined 2 ellipses.
+    /// </summary>
+    public IComObject<ID2D1Geometry>? GetCombinedEllipsesGeometry(RectangleF rect1, RectangleF rect2, D2D1_COMBINE_MODE combineMode)
+    {
+        // create ellipse 1
+        var ellipse1 = new D2D1_ELLIPSE(rect1.X + rect1.Width / 2, rect1.Y + rect1.Height / 2, rect1.Width / 2, rect1.Height / 2);
+
+        // create ellipse 2
+        var ellipse2 = new D2D1_ELLIPSE(rect2.X + rect2.Width / 2, rect2.Y + rect2.Height / 2, rect2.Width / 2, rect2.Height / 2);
+
+
+        // create geometries
+        var shape1Geo = D2DFactory.CreateEllipseGeometry(ellipse1);
+        var shape2Geo = D2DFactory.CreateEllipseGeometry(ellipse2);
+
+        // create path geometry to get the combined shape
+        var pathGeo = D2DFactory.CreatePathGeometry();
+        pathGeo.Object.Open(out var pathGeoSink).ThrowOnError();
+
+
+        // combine 2 geometry shapes
+        shape1Geo.Object.CombineWithGeometry(shape2Geo.Object, combineMode, IntPtr.Zero, 0, pathGeoSink).ThrowOnError();
+
+        pathGeoSink.Close();
+        Marshal.ReleaseComObject(pathGeoSink);
+        shape1Geo.Dispose();
+        shape2Geo.Dispose();
+
+
+        return pathGeo;
+    }
+
+
+    /// <summary>
+    /// Draw geometry.
+    /// </summary>
+    public void DrawGeometry(IComObject<ID2D1Geometry>? geo, Color borderColor, Color? fillColor = null, float strokeWidth = 1f)
+    {
+        if (geo is not IComObject<ID2D1Geometry> geometry) return;
+
+        // draw background color -----------------------------------
+        if (fillColor != null)
+        {
+            var bgColor = DXHelper.FromColor(fillColor.Value);
+            var bgBrushStylePtr = new D2D1_BRUSH_PROPERTIES()
+            {
+                opacity = 1f,
+            }.StructureToPtr();
+            DeviceContext.CreateSolidColorBrush(bgColor, bgBrushStylePtr, out var bgBrush);
+
+            // fill the combined geometry
+            DeviceContext.FillGeometry(geometry.Object, bgBrush);
+
+            Marshal.FreeHGlobal(bgBrushStylePtr);
+        }
+
+
+        // draw border color ----------------------------------------
+        if (borderColor != Color.Transparent)
+        {
+            var bdColor = DXHelper.FromColor(borderColor);
+            var borderBrushStylePtr = new D2D1_BRUSH_PROPERTIES()
+            {
+                opacity = 1f,
+            }.StructureToPtr();
+            DeviceContext.CreateSolidColorBrush(bdColor, borderBrushStylePtr, out var borderBrush);
+
+            // draw the combined geometry
+            DeviceContext.DrawGeometry(geometry.Object, borderBrush, strokeWidth);
+
+            Marshal.FreeHGlobal(borderBrushStylePtr);
+        }
+    }
+
+    #endregion // Draw / Fill Geometry
+
+
+    #endregion
+
 }

Source/DXControl/Graphics/GdipGraphics.cs

@@ -1,6 +1,6 @@
 /*
 MIT License
-Copyright (C) 2022 DUONG DIEU PHAP
+Copyright (C) 2022 - 2023 DUONG DIEU PHAP
 Project & license info: https://github.com/d2phap/DXControl
 */
 using System.Drawing.Drawing2D;
@@ -193,112 +193,6 @@ public void DrawRectangle(RectangleF rect, float radius, Color borderColor, Colo
     #endregion // Draw / Fill Rectangle
 
 
-    #region Draw / Fill Geometry
-
-    public GeometryObject GetCombinedRectanglesGeometry(RectangleF rect1, RectangleF rect2,
-        float rect1Radius, float rect2Radius, CombineMode combineMode)
-    {
-        var path1 = GetRoundRectanglePath(rect1, rect1Radius);
-        var path2 = GetRoundRectanglePath(rect2, rect2Radius);
-        var region = new Region(path1);
-
-        if (combineMode == CombineMode.Union)
-        {
-            region.Union(path2);
-        }
-        else if (combineMode == CombineMode.Intesect)
-        {
-            region.Intersect(path2);
-        }
-        else if (combineMode == CombineMode.Xor)
-        {
-            region.Xor(path2);
-        }
-        else if (combineMode == CombineMode.Exclude)
-        {
-            region.Exclude(path2);
-        }
-
-        return new GeometryObject()
-        {
-            GdiRegion = region,
-            GdiPath = path1,
-        };
-    }
-
-
-    public GeometryObject GetCombinedEllipsesGeometry(RectangleF rect1, RectangleF rect2, CombineMode combineMode)
-    {
-        // create ellipse paths
-        var path1 = new GraphicsPath();
-        path1.AddEllipse(rect1);
-
-        var path2 = new GraphicsPath();
-        path2.AddEllipse(rect2);
-
-
-        // combine 2 paths
-        var region = new Region(path1);
-
-        if (combineMode == CombineMode.Union)
-        {
-            region.Union(path2);
-        }
-        else if (combineMode == CombineMode.Intesect)
-        {
-            region.Intersect(path2);
-        }
-        else if (combineMode == CombineMode.Xor)
-        {
-            region.Xor(path2);
-        }
-        else if (combineMode == CombineMode.Exclude)
-        {
-            region.Exclude(path2);
-        }
-
-        return new GeometryObject()
-        {
-            GdiRegion = region,
-            GdiPath = path1,
-        };
-    }
-
-
-    /// <summary>
-    /// Draw geometry.
-    /// <para>
-    /// <c>**Note:</c>
-    /// Currently GDI+ only draws correctly for 2 mode: <see cref="CombineMode.Intesect"/> and <see cref="CombineMode.Exclude"/>
-    /// </para>
-    /// </summary>
-    public void DrawGeometry(GeometryObject geoObj, Color borderColor, Color? fillColor = null, float strokeWidth = 1)
-    {
-        if (geoObj.GdiRegion is not Region region) return;
-        if (geoObj.GdiPath is not GraphicsPath path) return;
-
-        Graphics.Clip = region;
-
-        // fill background
-        if (fillColor != null)
-        {
-            using var bgBrush = new SolidBrush(fillColor.Value);
-            Graphics.FillPath(bgBrush, path);
-        }
-
-        // draw border
-        if (borderColor != Color.Transparent)
-        {
-            using var borderPen = new Pen(borderColor, strokeWidth);
-            Graphics.DrawPath(borderPen, path);
-        }
-
-        Graphics.ResetClip();
-    }
-
-    #endregion // Draw / Fill Geometry
-
-
     #region Draw / Measure text
 
     public void DrawText(string text, string fontFamilyName, float fontSize, float x, float y, Color c, float? textDpi = null, StringAlignment hAlign = StringAlignment.Near, StringAlignment vAlign = StringAlignment.Near, bool isBold = false, bool isItalic = false)