Add method RecreateDirect2DCanvas

MessageToImageLibrary 0.1.2
watfordjc · Sep 7, 2020 · 7d1dd73 · 7d1dd73
1 parent e2a57f8
commit 7d1dd73
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/Direct2DWrapper/Resource.rc b/Direct2DWrapper/Resource.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,1,1
- PRODUCTVERSION 0,0,1,1
+ FILEVERSION 0,0,1,2
+ PRODUCTVERSION 0,0,1,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x3L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "John Cook"
             VALUE "FileDescription", "Wrapper for Direct2D"
-            VALUE "FileVersion", "0.0.1.1"
+            VALUE "FileVersion", "0.0.1.2"
             VALUE "InternalName", "Direct2DWrapper"
             VALUE "LegalCopyright", "Copyright (C) John Cook 2020"
             VALUE "OriginalFilename", "Direct2DWrapper.dll"
             VALUE "ProductName", "MessageToImageLibrary"
-            VALUE "ProductVersion", "0.0.1.1"
+            VALUE "ProductVersion", "0.0.1.2"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/MessageToImageLibrary/MessagePanel.cs b/MessageToImageLibrary/MessagePanel.cs
@@ -136,6 +136,29 @@ public void CreateDirect2DCanvas(SizeU canvasSize, ref Direct2DPointers direct2D
             Marshal.ThrowExceptionForHR(UnsafeNativeMethods.CreateRenderTarget(ref Direct2DCanvas));
         }
 
+        public void RecreateDirect2DCanvas()
+        {
+            // Release brushes from old render target
+            ReleaseAllBrushes();
+            // Release text layouts from old render target
+            UnsafeNativeMethods.ReleaseTextLayout(headerTextLayout);
+            UnsafeNativeMethods.ReleaseTextLayout(subHeaderTextLayout);
+            UnsafeNativeMethods.ReleaseTextLayout(displayNameTextLayout);
+            UnsafeNativeMethods.ReleaseTextLayout(usernameTextLayout);
+            UnsafeNativeMethods.ReleaseTextLayout(messageTextTextLayout);
+            UnsafeNativeMethods.ReleaseTextLayout(timeTextLayout);
+            UnsafeNativeMethods.ReleaseTextLayout(sharerDisplayNameTextLayout);
+            UnsafeNativeMethods.ReleaseTextLayout(sharerUsernameTextLayout);
+            UnsafeNativeMethods.ReleaseTextLayout(headerTextLayout);
+            UnsafeNativeMethods.ReleaseTextLayout(headerTextLayout);
+            // Release old render target
+            UnsafeNativeMethods.ReleaseRenderTarget(Direct2DCanvas);
+            // Create replacement render target
+            Marshal.ThrowExceptionForHR(UnsafeNativeMethods.CreateRenderTarget(ref Direct2DCanvas));
+            // Wipe replacement render target with background colour
+            WipeCanvas(true, true);
+        }
+
         public void SetFont(CanvasElement canvasElement, FontSettings fontSettings)
         {
             switch (canvasElement)

diff --git a/MessageToImageLibrary/MessageToImageLibrary.csproj b/MessageToImageLibrary/MessageToImageLibrary.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
     <Platforms>AnyCPU;x64;x86</Platforms>
-    <Version>0.1.1</Version>
+    <Version>0.1.2</Version>
     <Authors>John Cook</Authors>
     <Company>John Cook</Company>
     <Description>A test/sample C# solution with an ordinary (non-MFC) C++ DLL project.</Description>