Merge pull request #1978 from onesounds/PrimaryMonitor

Author: onesounds

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -195,6 +195,17 @@ public string QuerySearchPrecisionString
 
         public double WindowLeft { get; set; }
         public double WindowTop { get; set; }
+        
+        /// <summary>
+        /// Custom left position on selected monitor
+        /// </summary>
+        public double CustomWindowLeft { get; set; } = 0;
+        
+        /// <summary>
+        /// Custom top position on selected monitor
+        /// </summary>
+        public double CustomWindowTop { get; set; } = 0;
+        
         public int MaxResultsToShow { get; set; } = 5;
         public int ActivateTimes { get; set; }
 
@@ -227,7 +238,15 @@ public bool HideNotifyIcon
         }
         public bool LeaveCmdOpen { get; set; }
         public bool HideWhenDeactivated { get; set; } = true;
-        public SearchWindowPositions SearchWindowPosition { get; set; } = SearchWindowPositions.MouseScreenCenter;
+
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public SearchWindowScreens SearchWindowScreen { get; set; } = SearchWindowScreens.RememberLastLaunchLocation;
+        
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public SearchWindowAligns SearchWindowAlign { get; set; } = SearchWindowAligns.Center;
+
+        public int CustomScreenNumber { get; set; } = 1;
+
         public bool IgnoreHotkeysOnFullscreen { get; set; }
 
         public HttpProxy Proxy { get; set; } = new HttpProxy();
@@ -253,12 +272,22 @@ public enum ColorSchemes
         Light,
         Dark
     }
-    public enum SearchWindowPositions
+    
+    public enum SearchWindowScreens
     {
         RememberLastLaunchLocation,
-        MouseScreenCenter,
-        MouseScreenCenterTop,
-        MouseScreenLeftTop,
-        MouseScreenRightTop
+        Cursor,
+        Focus,
+        Primary,
+        Custom
+    }
+    
+    public enum SearchWindowAligns
+    {
+        Center,
+        CenterTop,
+        LeftTop,
+        RightTop,
+        Custom
     }
 }

Flow.Launcher/Helper/WindowsInteropHelper.cs

@@ -35,25 +35,25 @@ private static IntPtr HWND_DESKTOP
         }
 
         [DllImport("user32.dll", SetLastError = true)]
-        private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
-
+        internal static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+        
         [DllImport("user32.dll")]
-        private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+        internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
 
         [DllImport("user32.dll")]
-        private static extern IntPtr GetForegroundWindow();
+        internal static extern IntPtr GetForegroundWindow();
 
         [DllImport("user32.dll")]
-        private static extern IntPtr GetDesktopWindow();
+        internal static extern IntPtr GetDesktopWindow();
 
         [DllImport("user32.dll")]
-        private static extern IntPtr GetShellWindow();
+        internal static extern IntPtr GetShellWindow();
 
         [DllImport("user32.dll", SetLastError = true)]
-        private static extern int GetWindowRect(IntPtr hwnd, out RECT rc);
+        internal static extern int GetWindowRect(IntPtr hwnd, out RECT rc);
 
         [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        private static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
+        internal static extern int GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
 
         [DllImport("user32.DLL")]
         public static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass, string lpszWindow);

Flow.Launcher/Languages/en.xaml

@@ -38,11 +38,16 @@
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
     <system:String x:Key="SearchWindowPosition">Search Window Position</system:String>
-    <system:String x:Key="SearchWindowPositionRememberLastLaunchLocation">Remember Last Position</system:String>
-    <system:String x:Key="SearchWindowPositionMouseScreenCenter">Mouse Focused Screen - Center</system:String>
-    <system:String x:Key="SearchWindowPositionMouseScreenCenterTop">Mouse Focused Screen - Center Top</system:String>
-    <system:String x:Key="SearchWindowPositionMouseScreenLeftTop">Mouse Focused Screen - Left Top</system:String>
-    <system:String x:Key="SearchWindowPositionMouseScreenRightTop">Mouse Focused Screen - Right Top</system:String>
+    <system:String x:Key="SearchWindowScreenRememberLastLaunchLocation">Remember Last Position</system:String>
+    <system:String x:Key="SearchWindowScreenCursor">Monitor with Mouse Cursor</system:String>
+    <system:String x:Key="SearchWindowScreenFocus">Monitor with Focused Window</system:String>
+    <system:String x:Key="SearchWindowScreenPrimary">Primary Monitor</system:String>
+    <system:String x:Key="SearchWindowScreenCustom">Custom Monitor</system:String>
+    <system:String x:Key="SearchWindowAlignCenter">Center</system:String>
+    <system:String x:Key="SearchWindowAlignCenterTop">Center Top</system:String>
+    <system:String x:Key="SearchWindowAlignLeftTop">Left Top</system:String>
+    <system:String x:Key="SearchWindowAlignRightTop">Right Top</system:String>
+    <system:String x:Key="SearchWindowAlignCustom">Custom Position</system:String>
     <system:String x:Key="language">Language</system:String>
     <system:String x:Key="lastQueryMode">Last Query Style</system:String>
     <system:String x:Key="lastQueryModeToolTip">Show/Hide previous results when Flow Launcher is reactivated.</system:String>

Flow.Launcher/MainWindow.xaml.cs

@@ -25,6 +25,7 @@
 using ModernWpf.Controls;
 using Key = System.Windows.Input.Key;
 using System.Media;
+using System.Linq;
 
 namespace Flow.Launcher
 {
@@ -200,29 +201,39 @@ private void OnLoaded(object sender, RoutedEventArgs _)
 
         private void InitializePosition()
         {
-            switch (_settings.SearchWindowPosition)
+            if (_settings.SearchWindowScreen == SearchWindowScreens.RememberLastLaunchLocation)
             {
-                case SearchWindowPositions.RememberLastLaunchLocation:
-                    Top = _settings.WindowTop;
-                    Left = _settings.WindowLeft;
-                    break;
-                case SearchWindowPositions.MouseScreenCenter:
-                    Left = HorizonCenter();
-                    Top = VerticalCenter();
-                    break;
-                case SearchWindowPositions.MouseScreenCenterTop:
-                    Left = HorizonCenter();
-                    Top = 10;
-                    break;
-                case SearchWindowPositions.MouseScreenLeftTop:
-                    Left = 10;
-                    Top = 10;
-                    break;
-                case SearchWindowPositions.MouseScreenRightTop:
-                    Left = HorizonRight();
-                    Top = 10;
-                    break;
+                Top = _settings.WindowTop;
+                Left = _settings.WindowLeft;
+            }
+            else
+            {
+                var screen = SelectedScreen();
+                switch (_settings.SearchWindowAlign)
+                {
+                    case SearchWindowAligns.Center:
+                        Left = HorizonCenter(screen);
+                        Top = VerticalCenter(screen);
+                        break;
+                    case SearchWindowAligns.CenterTop:
+                        Left = HorizonCenter(screen);
+                        Top = 10;
+                        break;
+                    case SearchWindowAligns.LeftTop:
+                        Left = HorizonLeft(screen);
+                        Top = 10;
+                        break;
+                    case SearchWindowAligns.RightTop:
+                        Left = HorizonRight(screen);
+                        Top = 10;
+                        break;
+                    case SearchWindowAligns.Custom:
+                        Left = WindowsInteropHelper.TransformPixelsToDIP(this, screen.WorkingArea.X + _settings.CustomWindowLeft, 0).X;
+                        Top = WindowsInteropHelper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Y + _settings.CustomWindowTop).Y;
+                        break;
+                }
             }
+
         }
 
         private void UpdateNotifyIconText()
@@ -339,8 +350,9 @@ private async void PositionReset()
         {
             _viewModel.Show();
             await Task.Delay(300); // If don't give a time, Positioning will be weird.
-            Left = HorizonCenter();
-            Top = VerticalCenter();
+            var screen = SelectedScreen();
+            Left = HorizonCenter(screen);
+            Top = VerticalCenter(screen);
         }
 
         private void InitProgressbarAnimation()
@@ -502,7 +514,7 @@ private void OnLocationChanged(object sender, EventArgs e)
         {
             if (_animating)
                 return;
-            if (_settings.SearchWindowPosition == SearchWindowPositions.RememberLastLaunchLocation)
+            if (_settings.SearchWindowScreen == SearchWindowScreens.RememberLastLaunchLocation)
             {
                 _settings.WindowLeft = Left;
                 _settings.WindowTop = Top;
@@ -522,30 +534,62 @@ public void HideStartup()
             }
         }
 
-        public double HorizonCenter()
+        public Screen SelectedScreen()
+        {
+            Screen screen = null;
+            switch(_settings.SearchWindowScreen)
+            {
+                case SearchWindowScreens.Cursor:
+                    screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);
+                    break;
+                case SearchWindowScreens.Primary:
+                    screen = Screen.PrimaryScreen;
+                    break;
+                case SearchWindowScreens.Focus:
+                    IntPtr foregroundWindowHandle = WindowsInteropHelper.GetForegroundWindow();
+                    screen = Screen.FromHandle(foregroundWindowHandle);
+                    break;
+                case SearchWindowScreens.Custom:
+                    if (_settings.CustomScreenNumber <= Screen.AllScreens.Length)
+                        screen = Screen.AllScreens[_settings.CustomScreenNumber - 1];
+                    else
+                        screen = Screen.AllScreens[0];
+                    break;
+                default:
+                    screen = Screen.AllScreens[0];
+                    break;
+            }
+            return screen ?? Screen.AllScreens[0];
+        }
+        
+        public double HorizonCenter(Screen screen)
         {
-            var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);
             var dip1 = WindowsInteropHelper.TransformPixelsToDIP(this, screen.WorkingArea.X, 0);
             var dip2 = WindowsInteropHelper.TransformPixelsToDIP(this, screen.WorkingArea.Width, 0);
             var left = (dip2.X - ActualWidth) / 2 + dip1.X;
             return left;
         }
 
-        public double VerticalCenter()
+        public double VerticalCenter(Screen screen)
         {
-            var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);
             var dip1 = WindowsInteropHelper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Y);
             var dip2 = WindowsInteropHelper.TransformPixelsToDIP(this, 0, screen.WorkingArea.Height);
             var top = (dip2.Y - QueryTextBox.ActualHeight) / 4 + dip1.Y;
             return top;
         }
 
-        public double HorizonRight()
+        public double HorizonRight(Screen screen)
         {
-            var screen = Screen.FromPoint(System.Windows.Forms.Cursor.Position);
             var dip1 = WindowsInteropHelper.TransformPixelsToDIP(this, screen.WorkingArea.X, 0);
             var dip2 = WindowsInteropHelper.TransformPixelsToDIP(this, screen.WorkingArea.Width, 0);
-            var left = (dip2.X - ActualWidth) - 10;
+            var left = (dip1.X + dip2.X - ActualWidth) - 10;
+            return left;
+        }
+
+        public double HorizonLeft(Screen screen)
+        {
+            var dip1 = WindowsInteropHelper.TransformPixelsToDIP(this, screen.WorkingArea.X, 0);
+            var left = dip1.X + 10;
             return left;
         }