Merge branch 'develop' into main

ControlzEx · Jul 24, 2020 · 529527c · 529527c
2 parents 31b0b50 + d8c4185
commit 529527c
Show file tree

Hide file tree

Showing 13 changed files with 309 additions and 132 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,53 @@
+---
+name: Bug report
+about: Create a bug report to help us to improve ControlzEx
+title: ''
+labels: Bug
+assignees: ''
+
+---
+
+## Describe the bug
+
+<!--
+A clear and concise description of what the bug is. Questions about usage are better asked in the Gitter https://gitter.im/ControlzEx/ControlzEx room.
+-->
+
+## Steps to reproduce
+
+<!--
+A description of how to trigger this bug.
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+If it's possible follow these guidelines for a good sample and I will most likely look at the issue sooner:
+
+- Post a full GitHub repository. Not a zip file, half baked snippet etc. If GitHub is new to you consider it a great learning opportunity and chance to get involved.
+- The repository should have just ONE step max for me to get running, and that is "Restore NuGet Packages". If there are any other missing dependencies, or new features I will most likely move on to another issue.
+- I'm not trying to be awkward. I'm just busy and I'm helping a lot of people, not just you, so help me out and I will help you out.
+
+-->
+
+## Expected behavior
+
+<!-- A description of what you're expecting, possibly containing screenshots or reference material. -->
+
+## Actual behavior
+
+<!-- What's actually happening? -->
+
+## Environment
+
+```
+ControlzEx version: v4.x.x
+Windows build number: Win10 1909 [Version 10.0.x.x]
+Visual Studio: 2019 16.x.x
+Target Framework: .Net Core 3.1 (v4.x.x)
+```
+
+## Screenshots
+
+<!-- If applicable, add screenshots to help explain your problem. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for ControlzEx
+title: ''
+labels: Feature Request
+assignees: ''
+
+---
+
+## Describe the feature
+
+<!-- 
+Describe your feature request.
+A clear and concise description of what you want to happen.
+-->
+
+## Additional context
+
+<!-- Add any other context or screenshots about the feature request here. -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,18 @@
+## Describe the changes you have made to improve this project
+
+<!--
+Is your feature request related to a problem? Please describe.
+A clear and concise description of what the change is.
+-->
+
+## Unit test
+
+<!-- If it's possible then make a unit test for your changes. -->
+
+## Additional context
+
+<!-- Add any other context or screenshots about the feature request here. -->
+
+## Closed Issues
+
+<!-- Closes #xxxx -->
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -4,6 +4,7 @@ next-version: 4.3.0
 mode: ContinuousDeployment
 branches:
   master:
+    regex: ^main
     mode: ContinuousDeployment
     tag: rc
     prevent-increment-of-merged-branch-version: true

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 [![Downloads](https://img.shields.io/nuget/dt/ControlzEx.svg?style=flat-square)](http://www.nuget.org/packages/ControlzEx/)
 [![Issues](https://img.shields.io/github/issues/ControlzEx/ControlzEx.svg?style=flat-square)](https://github.com/ControlzEx/ControlzEx/issues)
 [![Nuget](https://img.shields.io/nuget/vpre/ControlzEx.svg?style=flat-square)](http://nuget.org/packages/ControlzEx)
-[![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/ControlzEx/ControlzEx/blob/master/License.txt)
+[![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/ControlzEx/ControlzEx/blob/main/License.txt)
 
 [![Twitter Jan](https://img.shields.io/badge/twitter-%40punker76-55acee.svg?style=flat-square)](https://twitter.com/punker76) [![Twitter Bastian](https://img.shields.io/badge/twitter-%40batzendev-55acee.svg?style=flat-square)](https://twitter.com/batzendev) [![Twitter James](https://img.shields.io/badge/twitter-%40James_Willock-55acee.svg?style=flat-square)](https://twitter.com/James_Willock)
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,11 +1,9 @@
 # http://www.appveyor.com/docs/appveyor-yml
 
-# configuration for develop/CI and master/Release branch
-
 branches:
   only:
     - develop
-    - master
+    - main
     - /\d*\.\d*\.\d*/
 
 environment:

diff --git a/build.cake b/build.cake
@@ -6,7 +6,7 @@
 #tool "dotnet:?package=NuGetKeyVaultSignTool&version=1.2.18"
 #tool "dotnet:?package=AzureSignTool&version=2.0.17"
 
-#tool GitVersion.CommandLine&version=5.0.1
+#tool GitVersion.CommandLine&version=5.3.7
 #tool gitreleasemanager
 #tool vswhere
 #addin Cake.Figlet
@@ -36,7 +36,7 @@ GitVersion gitVersion = GitVersion(new GitVersionSettings { OutputType = GitVers
 var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest;
 var branchName = gitVersion.BranchName;
 var isDevelopBranch = StringComparer.OrdinalIgnoreCase.Equals("develop", branchName);
-var isReleaseBranch = StringComparer.OrdinalIgnoreCase.Equals("master", branchName);
+var isReleaseBranch = StringComparer.OrdinalIgnoreCase.Equals("main", branchName);
 var isTagged = AppVeyor.Environment.Repository.Tag.IsTag;
 
 var latestInstallationPath = VSWhereLatest(new VSWhereLatestSettings { IncludePrerelease = true });

diff --git a/src/ControlzEx/Behaviors/WindowChromeBehavior.MessageHandling.cs b/src/ControlzEx/Behaviors/WindowChromeBehavior.MessageHandling.cs
@@ -633,7 +633,7 @@ private IntPtr _HandleGETMINMAXINFO(WM uMsg, IntPtr wParam, IntPtr lParam, out b
                 var monitor = NativeMethods.MonitorFromWindow(this.windowHandle, MonitorOptions.MONITOR_DEFAULTTONEAREST);
                 if (monitor != IntPtr.Zero)
                 {
-                    var monitorInfo = NativeMethods.GetMonitorInfoW(monitor);
+                    var monitorInfo = NativeMethods.GetMonitorInfo(monitor);
                     var rcWorkArea = monitorInfo.rcWork;
                     var rcMonitorArea = monitorInfo.rcMonitor;
 
@@ -722,7 +722,7 @@ private IntPtr _HandleMOVEForRealSize(WM uMsg, IntPtr wParam, IntPtr lParam, out
                 if (monitorFromWindow != IntPtr.Zero)
                 {
                     var ignoreTaskBar = this.IgnoreTaskbarOnMaximize;
-                    var monitorInfo = NativeMethods.GetMonitorInfoW(monitorFromWindow);
+                    var monitorInfo = NativeMethods.GetMonitorInfo(monitorFromWindow);
                     var rcMonitorArea = ignoreTaskBar ? monitorInfo.rcMonitor : monitorInfo.rcWork;
                     /*
                      * ASYNCWINDOWPOS

diff --git a/src/ControlzEx/Microsoft.Windows.Shell/Standard/ErrorCodes.cs b/src/ControlzEx/Microsoft.Windows.Shell/Standard/ErrorCodes.cs
@@ -94,6 +94,8 @@ public Win32Error(int i)
             _value = i;
         }
 
+        public int Error => _value;
+
         /// <summary>Performs HRESULT_FROM_WIN32 conversion.</summary>
         /// <param name="error">The Win32 error being converted to an HRESULT.</param>
         /// <returns>The equivilent HRESULT value.</returns>

diff --git a/src/ControlzEx/Microsoft.Windows.Shell/Standard/MonitorHelper.cs b/src/ControlzEx/Microsoft.Windows.Shell/Standard/MonitorHelper.cs
@@ -2,23 +2,47 @@
 namespace ControlzEx.Standard
 {
     using System;
+    using System.Diagnostics;
 
     internal static class MonitorHelper
     {
         /// <summary>
-        ///     Gets the monitor information from the current cursor position.
+        /// Gets the monitor information from the current cursor position.
         /// </summary>
-        /// <returns></returns>
+        /// <returns>The monitor information.</returns>
         public static MONITORINFO GetMonitorInfoFromPoint()
         {
-            var cursorPos = NativeMethods.GetCursorPos();
-            var monitor = NativeMethods.MonitorFromPoint(cursorPos, MonitorOptions.MONITOR_DEFAULTTONEAREST);
-            if (monitor != IntPtr.Zero)
+            if (TryGetMonitorInfoFromPoint(out var mi))
             {
-                var monitorInfo = NativeMethods.GetMonitorInfo(monitor);
-                return monitorInfo;
+                return mi;
             }
-            return new MONITORINFO();
+
+            return default;
+        }
+
+        /// <summary>
+        /// Gets the monitor information from the current cursor position.
+        /// </summary>
+        /// <returns>True when getting the monitor information was successful.</returns>
+        public static bool TryGetMonitorInfoFromPoint(out MONITORINFO monitorInfo)
+        {
+            try
+            {
+                var cursorPos = NativeMethods.GetCursorPos();
+                var monitor = NativeMethods.MonitorFromPoint(cursorPos, MonitorOptions.MONITOR_DEFAULTTONEAREST);
+                if (monitor != IntPtr.Zero)
+                {
+                    monitorInfo = NativeMethods.GetMonitorInfo(monitor);
+                    return true;
+                }
+            }
+            catch (UnauthorizedAccessException ex)
+            {
+                Trace.TraceError("Could not get the monitor info with the current cursor position: {0}", ex);
+            }
+
+            monitorInfo = default;
+            return false;
         }
     }
 }