fallback on default monitor if current monitor cannot be determined

maximcus · Dec 8, 2016 · 7c1ad11 · 7c1ad11
1 parent 65b58e1
commit 7c1ad11
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 4 deletions.
diff --git a/WPFTabTip/AnimationHelper.cs b/WPFTabTip/AnimationHelper.cs
@@ -129,7 +129,8 @@ private static double GetYOffsetToMoveUIElementInToWorkArea(Rectangle uiElementR
             const int paddingTop = 30;
             const int paddingBottom = 10;
 
-            if (workAreaRectangle.Contains(uiElementRectangle))                                    // UIElement is in work area
+            if (uiElementRectangle.Top >= workAreaRectangle.Top &&
+                uiElementRectangle.Bottom <= workAreaRectangle.Bottom)                             // UIElement is in work area
                 return noOffset;
 
             if (uiElementRectangle.Top < workAreaRectangle.Top)                                    // Top of UIElement higher than work area

diff --git a/WPFTabTip/Screen.cs b/WPFTabTip/Screen.cs
@@ -13,9 +13,9 @@ internal class Screen
 
         public Screen(Window window)
         {
-            IntPtr windowHandle = new WindowInteropHelper(window).Handle;
-            
-            IntPtr monitor = NativeMethods.MonitorFromWindow(windowHandle, NativeMethods.MONITOR_DEFAULTTONEAREST);
+            IntPtr windowHandle = window != null ? new WindowInteropHelper(window).Handle : IntPtr.Zero;
+
+            IntPtr monitor = window != null ? NativeMethods.MonitorFromWindow(windowHandle, NativeMethods.MONITOR_DEFAULTTONEAREST) : NativeMethods.MonitorFromPoint(new NativeMethods.POINT(0, 0), NativeMethods.MonitorOptions.MONITOR_DEFAULTTOPRIMARY);
 
             NativeMethods.NativeMonitorInfo monitorInfo = new NativeMethods.NativeMonitorInfo();
             NativeMethods.GetMonitorInfo(monitor, monitorInfo);
@@ -46,6 +46,41 @@ public struct NativeRectangle
                 public readonly int Bottom;
             }
 
+            [StructLayout(LayoutKind.Sequential)]
+            public struct POINT
+            {
+                public int X;
+                public int Y;
+
+                public POINT(int x, int y)
+                {
+                    this.X = x;
+                    this.Y = y;
+                }
+
+                public POINT(System.Drawing.Point pt) : this(pt.X, pt.Y) { }
+
+                public static implicit operator System.Drawing.Point(POINT p)
+                {
+                    return new System.Drawing.Point(p.X, p.Y);
+                }
+
+                public static implicit operator POINT(System.Drawing.Point p)
+                {
+                    return new POINT(p.X, p.Y);
+                }
+            }
+
+            [DllImport("user32.dll", SetLastError = true)]
+            internal static extern IntPtr MonitorFromPoint(POINT pt, MonitorOptions dwFlags);
+
+            internal enum MonitorOptions : uint
+            {
+                MONITOR_DEFAULTTONULL = 0x00000000,
+                MONITOR_DEFAULTTOPRIMARY = 0x00000001,
+                MONITOR_DEFAULTTONEAREST = 0x00000002
+            }
+
 #pragma warning disable 169
 
             [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]