Merge pull request #1443 from kellyelton/master

Fixes #1442

Author: kellyelton

octgnFX/Octgn/Controls/OpaqueClickableImage.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
@@ -19,20 +20,73 @@ protected override HitTestResult HitTestCore(PointHitTestParameters hitTestParam
             var x = (int)(hitTestParameters.HitPoint.X / ActualWidth * source.PixelWidth);
             var y = (int)(hitTestParameters.HitPoint.Y / ActualHeight * source.PixelHeight);
 
-            // Copy the single pixel into a new byte array representing RGBA
-            var pixel = new byte[4];
-            if (x >= source.PixelWidth)
-                x = source.PixelWidth - 1;
-            if (y >= source.PixelHeight)
-                y = source.PixelHeight - 1;
-            source.CopyPixels(new Int32Rect(x, y, 1, 1), pixel, 4, 0);
-
-            // Check the alpha (transparency) of the pixel
-            // - threshold can be adjusted from 0 to 255
-            if (pixel[3] < 10)
+            if (x == source.PixelWidth) x--;
+            if (y == source.PixelHeight) y--;
+
+            var pixel = GetPixels(source)[x, y];
+
+            System.Diagnostics.Trace.WriteLine(pixel.Alpha);
+            if (pixel.Alpha < 5)
                 return null;
 
             return new PointHitTestResult(this, hitTestParameters.HitPoint);
         }
+
+        public PixelColor[,] GetPixels(BitmapSource source)
+        {
+            if (source.Format != PixelFormats.Bgra32)
+                source = new FormatConvertedBitmap(source, PixelFormats.Bgra32, null, 0);
+
+            int width = source.PixelWidth;
+            int height = source.PixelHeight;
+            PixelColor[,] result = new PixelColor[width, height];
+
+            BitmapSourceHelper.CopyPixels(source, result, width * 4, 0);
+            //source.CopyPixels(result, width * 4, 0);
+            return result;
+        }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct PixelColor
+    {
+        public byte Blue;
+        public byte Green;
+        public byte Red;
+        public byte Alpha;
+    }
+
+    public static class BitmapSourceHelper
+    {
+#if UNSAFE
+  public unsafe static void CopyPixels(this BitmapSource source, PixelColor[,] pixels, int stride, int offset)
+  {
+    fixed(PixelColor* buffer = &pixels[0, 0])
+      source.CopyPixels(
+        new Int32Rect(0, 0, source.PixelWidth, source.PixelHeight),
+        (IntPtr)(buffer + offset),
+        pixels.GetLength(0) * pixels.GetLength(1) * sizeof(PixelColor),
+        stride);
+  }
+#else
+        public static void CopyPixels(this BitmapSource source, PixelColor[,] pixels, int stride, int offset)
+        {
+            var height = source.PixelHeight;
+            var width = source.PixelWidth;
+            var pixelBytes = new byte[height * width * 4];
+            source.CopyPixels(pixelBytes, stride, 0);
+            int y0 = offset / width;
+            int x0 = offset - width * y0;
+            for (int y = 0; y < height; y++)
+                for (int x = 0; x < width; x++)
+                    pixels[x + x0, y + y0] = new PixelColor
+                    {
+                        Blue = pixelBytes[(y * width + x) * 4 + 0],
+                        Green = pixelBytes[(y * width + x) * 4 + 1],
+                        Red = pixelBytes[(y * width + x) * 4 + 2],
+                        Alpha = pixelBytes[(y * width + x) * 4 + 3],
+                    };
+        }
+#endif
     }
 }

recentchanges.txt

@@ -1 +1 @@
-Fixed a few spam errors - Kelly
+Fixed the transparent click through of images - Kelly