updated demo

Author: d2phap

Source/Demo/DXCanvas.cs

@@ -1,18 +1,27 @@
-using D2Phap;
+/*
+MIT License
+Copyright (C) 2022 DUONG DIEU PHAP
+Project & license info: https://github.com/d2phap/DXControl
+*/
+using D2Phap;
 using DirectN;
 using WicNet;
 
 namespace Demo;
 
 public class DXCanvas : DXControl
 {
-    private ID2D1Bitmap? _d2dBitmap = null;
-    
+    private IComObject<ID2D1Bitmap>? _d2dBitmap = null;
+    private D2D_RECT_F rectText = new(100f, 100f, new(400, 200));
+
     public WicBitmapSource? Image
     {
         set
         {
-            if (DeviceContext == null || value == null)
+            DXHelper.DisposeD2D1Bitmap(ref _d2dBitmap);
+            GC.Collect();
+
+            if (Device == null || value == null)
             {
                 _d2dBitmap = null;
                 return;
@@ -31,9 +40,11 @@ public WicBitmapSource? Image
             };
             var bitmapPropsPtr = bitmapProps.StructureToPtr();
 
-            DeviceContext.CreateBitmapFromWicBitmap(value.ComObject.Object, bitmapPropsPtr,
-                out _d2dBitmap)
+            Device.CreateBitmapFromWicBitmap(value.ComObject.Object, bitmapPropsPtr,
+                out ID2D1Bitmap bmp)
                 .ThrowOnError();
+
+            _d2dBitmap = new ComObject<ID2D1Bitmap>(bmp);
         }
     }
 
@@ -44,7 +55,7 @@ public DXCanvas()
     }
 
 
-    protected override void OnRender(DXGraphics g)
+    protected override void OnDirect2DRender(DXGraphics g)
     {
         var p1 = new D2D_POINT_2F(0, 0);
         var p2 = new D2D_POINT_2F(ClientSize.Width, ClientSize.Height);
@@ -57,8 +68,8 @@ protected override void OnRender(DXGraphics g)
         // draw image
         if (_d2dBitmap != null)
         {
-            _d2dBitmap.GetSize(out var size);
-            g.DrawBitmap(_d2dBitmap,
+            _d2dBitmap.Object.GetSize(out var size);
+            g.DrawBitmap(_d2dBitmap.Object,
                 new D2D_RECT_F(10f, 10f, size.width * 1, size.height * 1),
                 new D2D_RECT_F(0, 0, size.width, size.height));
         }
@@ -95,17 +106,20 @@ protected override void OnRender(DXGraphics g)
 
     }
 
+    
 
-    protected override void OnRender(Graphics g)
+    protected override void OnGdiPlusRender(Graphics g)
     {
         using var pen = new Pen(Color.Red, 5);
         g.DrawRectangle(pen, new Rectangle(
             (int)rectText.left, (int)rectText.top - 50,
             (int)rectText.Width, (int)rectText.Height));
+
+        g.DrawString($"FPS: {FPS} - GDI+", Font, Brushes.Purple, new PointF(100, 100));
     }
 
 
-    private D2D_RECT_F rectText = new(100f, 100f, new(400, 200));
+    
     protected override void OnFrame(FrameEventArgs e)
     {
         base.OnFrame(e);

Source/Demo/Form1.Designer.cs

@@ -1,7 +1,10 @@
-using DirectN;
+/*
+MIT License
+Copyright (C) 2022 DUONG DIEU PHAP
+Project & license info: https://github.com/d2phap/DXControl
+*/
 using ImageMagick;
 using Microsoft.Win32.SafeHandles;
-using System.Drawing;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows.Media.Imaging;
@@ -36,10 +39,36 @@ private void Form1_Load(object sender, EventArgs e)
 
 
         var obj = Marshal.GetObjectForIUnknown(srcHandle.DangerousGetHandle());
-
         var wicSrc = new WicBitmapSource(obj);
         wicSrc.ConvertTo(WicPixelFormat.GUID_WICPixelFormat32bppPBGRA);
 
         return wicSrc;
     }
+
+    private void canvas_DragDrop(object sender, DragEventArgs e)
+    {
+        // Drag file from DESKTOP to APP
+        if (e.Data is null || !e.Data.GetDataPresent(DataFormats.FileDrop))
+            return;
+
+        var filePaths = (string[])e.Data.GetData(DataFormats.FileDrop, false);
+
+        if (filePaths.Length > 0)
+        {
+            Text = filePaths[0];
+
+            using var imgM = new MagickImage(Text);
+            canvas.Image = FromBitmapSource(imgM.ToBitmapSource());
+        }
+    }
+
+    private void canvas_DragOver(object sender, DragEventArgs e)
+    {
+        e.Effect = DragDropEffects.Copy;
+    }
+
+    private void chkD2D_CheckedChanged(object sender, EventArgs e)
+    {
+        canvas.UseHardwareAcceleration = chkD2D.Checked;
+    }
 }