Move image parsing from ImageControl to ImageForm

Author: aberus

src/ImageVisualizer14/ImageControl.xaml.cs

@@ -17,66 +17,18 @@ public partial class ImageControl : UserControl
         Point? lastMousePositionOnTarget;
         Point? lastDragPoint;
 
-        [DllImport("gdi32")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        static extern bool DeleteObject(IntPtr hObject);
-
         double _zoomValue = 1.0;
 
         public ImageControl()
         {
             InitializeComponent();
         }
 
-        public void SetImage(object sourceBitmap)
+        public void SetImage(ImageSource imageSource)
         {
-            if (sourceBitmap != null)
+            if (imageSource != null)
             {
-#if DEBUG
-                string expression = sourceBitmap.ToString();
-#endif
-
-                var method = sourceBitmap.GetType().GetMethod("ToBitmap", new Type[] { });
-                if (method != null)
-                {
-                    sourceBitmap = method.Invoke(sourceBitmap, null);
-                }
-
-                if (sourceBitmap is System.Drawing.Bitmap)
-                {
-                    BitmapSource bitmap = null;
-
-                    var hObject = ((System.Drawing.Bitmap)sourceBitmap).GetHbitmap();
-
-                    try
-                    {
-                        bitmap = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(
-                               hObject,
-                               IntPtr.Zero,
-                               Int32Rect.Empty,
-                               BitmapSizeOptions.FromEmptyOptions());
-                    }
-                    catch(Win32Exception)
-                    {
-                        bitmap = null;
-                    }
-                    finally
-                    {
-                        DeleteObject(hObject);
-                    }
-
-                    if(bitmap != null)
-                    {
-                        DisplayImage.Width = bitmap.Width;
-                        DisplayImage.Height = bitmap.Height;
-
-                        DisplayImage.Source = bitmap;
-                    }
-                }
-                else if (sourceBitmap is SerializableBitmapImage source)
-                {
-                    DisplayImage.Source = source;
-                }
+                DisplayImage.Source = imageSource;
             }
         }
 

src/ImageVisualizer14/ImageForm.cs

@@ -1,12 +1,20 @@
 using System;
+using System.ComponentModel;
 using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows;
 using System.Windows.Forms;
+using System.Windows.Media.Imaging;
 using Microsoft.VisualStudio.DebuggerVisualizers;
 
 namespace Aberus.VisualStudio.Debugger.ImageVisualizer
 {
     public partial class ImageForm : Form
     {
+        [DllImport("gdi32")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        static extern bool DeleteObject(IntPtr hObject);
+
         public static Font UIFont
         {
             get
@@ -26,7 +34,7 @@ public static Font UIFont
 #elif VS16
                 var dteProgID = "VisualStudio.DTE.16.0";
 #endif
-                var dte = (EnvDTE.DTE)System.Runtime.InteropServices.Marshal.GetActiveObject(dteProgID);
+                var dte = (EnvDTE.DTE)Marshal.GetActiveObject(dteProgID);
                 var fontProperty = dte.Properties["FontsAndColors", "Dialogs and Tool Windows"];
                 if (fontProperty != null)
                 {
@@ -39,7 +47,7 @@ public static Font UIFont
                     return font;
                 }
 
-                return SystemFonts.DefaultFont;
+                return System.Drawing.SystemFonts.DefaultFont;
             }
         }
 
@@ -57,7 +65,53 @@ public ImageForm(IVisualizerObjectProvider objectProvider)
             this.txtExpression.Font = UIFont;
             this.btnClose.Font = UIFont;
 
-            imageControl.SetImage(objectProvider.GetObject());
+            object objectBitmap = objectProvider.GetObject();
+            if (objectBitmap != null)
+            {
+#if DEBUG
+                string expression = objectBitmap.ToString();
+#endif
+
+                var method = objectBitmap.GetType().GetMethod("ToBitmap", new Type[] { });
+                if (method != null)
+                {
+                    objectBitmap = method.Invoke(objectBitmap, null);
+                }
+
+                BitmapSource bitmapSource = null;
+
+                if (objectBitmap is Bitmap)
+                {
+                    var hObject = ((Bitmap)objectBitmap).GetHbitmap();
+
+                    try
+                    {
+                        bitmapSource = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(
+                               hObject,
+                               IntPtr.Zero,
+                               Int32Rect.Empty,
+                               BitmapSizeOptions.FromEmptyOptions());
+                    }
+                    catch (Win32Exception)
+                    {
+                        bitmapSource = null;
+                    }
+                    finally
+                    {
+                        DeleteObject(hObject);
+                    }
+                }
+                else if (objectBitmap is SerializableBitmapImage serializableBitmapImage)
+                {
+                    bitmapSource = serializableBitmapImage;
+                }
+
+                if (bitmapSource != null)
+                {
+                    imageControl.SetImage(bitmapSource);
+                }
+            }
+     
             txtExpression.Text = objectProvider.GetObject().ToString();
         }
 

src/ImageVisualizerPackage/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.0.0")]
-[assembly: AssemblyFileVersion("0.7.0.0")]
+[assembly: AssemblyVersion("0.8.0.0")]
+[assembly: AssemblyFileVersion("0.8.0.0")]