[Workspaces] implement the move feature (#35480)

* [Workspaces] Add move functionality * spell checker * [Workspaces] Modify Arranger to move apps without launch * moved ipc helper * removed callback * use LauncherStatus in WindowArranger * wait for launching next app * launch in a separate thread and protect by mutexes * update app version in advance * changed canceling launch * increased waiting time * Fix optional parameter load from json * changed arranger waiting time * additional waiting time for Outlook * added app id * ensure ids before launch * set id in editor * minor updates * [Workspaces] Move: Get the nearest window when moving a window * [Workspaces] convert optional boolean to enum to avoid json problems * Handle case when the new Application Property "moveIfExists" does not exist * Re-implementing app-window pairing for moving feature. * spell checker * XAML formatting * Fixing bug: IPC message not arriving * spell checker * Removing app-level-setting for move app. Also fixed compiler errors due styling. * Updating editor window layout * Re-implementing window positioning UI elements * XAML formatting * Code review findings * Code cleanup * Code cleanup * Code cleanup * code cleanup * Code cleanup * Code cleanup * fix Move attribute after launch and snapshot * Extend WindowArranger with PWA functionality to detect different PWA apps. PwaHelper moved to the common library * fix repeat counter in the editor * Code optimization * code cleanup, optimization * fix double-processing window --------- Co-authored-by: Seraphima <[email protected]> Co-authored-by: donlaci <[email protected]>
microsoft · Dec 4, 2024 · 89be43e · 89be43e
1 parent e0949cb
commit 89be43e
Show file tree

Hide file tree

Showing 38 changed files with 668 additions and 556 deletions.
diff --git a/src/common/Display/dpi_aware.cpp b/src/common/Display/dpi_aware.cpp
@@ -109,6 +109,24 @@ namespace DPIAware
         }
     }
 
+    void InverseConvert(HMONITOR monitor_handle, RECT& rect)
+    {
+        if (monitor_handle == NULL)
+        {
+            const POINT ptZero = { 0, 0 };
+            monitor_handle = MonitorFromPoint(ptZero, MONITOR_DEFAULTTOPRIMARY);
+        }
+
+        UINT dpi_x, dpi_y;
+        if (GetDpiForMonitor(monitor_handle, MDT_EFFECTIVE_DPI, &dpi_x, &dpi_y) == S_OK)
+        {
+            rect.left = static_cast<long>(std::round(rect.left * static_cast<float>(DEFAULT_DPI) / dpi_x));
+            rect.right = static_cast<long>(std::round(rect.right * static_cast<float>(DEFAULT_DPI) / dpi_x));
+            rect.top = static_cast<long>(std::round(rect.top * static_cast<float>(DEFAULT_DPI) / dpi_y));
+            rect.bottom = static_cast<long>(std::round(rect.bottom * static_cast<float>(DEFAULT_DPI) / dpi_y));
+        }
+    }
+
     void EnableDPIAwarenessForThisProcess()
     {
         SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);

diff --git a/src/common/Display/dpi_aware.h b/src/common/Display/dpi_aware.h
@@ -15,6 +15,7 @@ namespace DPIAware
     void Convert(HMONITOR monitor_handle, RECT& rect);
     void ConvertByCursorPosition(float& width, float& height);
     void InverseConvert(HMONITOR monitor_handle, float& width, float& height);
+    void InverseConvert(HMONITOR monitor_handle, RECT& rect);
     void EnableDPIAwarenessForThisProcess();
 
     enum AwarenessLevel

diff --git a/src/modules/Workspaces/WorkspacesEditor/Data/ProjectData.cs b/src/modules/Workspaces/WorkspacesEditor/Data/ProjectData.cs
@@ -3,9 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-
-using Workspaces.Data;
-
 using static WorkspacesEditor.Data.ProjectData;
 
 namespace WorkspacesEditor.Data

diff --git a/src/modules/Workspaces/WorkspacesEditor/Data/TempProjectData.cs b/src/modules/Workspaces/WorkspacesEditor/Data/TempProjectData.cs
@@ -8,13 +8,7 @@ namespace WorkspacesEditor.Data
 {
     public class TempProjectData : ProjectData
     {
-        public static string File
-        {
-            get
-            {
-                return FolderUtils.DataFolder() + "\\temp-workspaces.json";
-            }
-        }
+        public static string File => FolderUtils.DataFolder() + "\\temp-workspaces.json";
 
         public static void DeleteTempFile()
         {

diff --git a/src/modules/Workspaces/WorkspacesEditor/Data/WorkspacesData.cs b/src/modules/Workspaces/WorkspacesEditor/Data/WorkspacesData.cs
@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-
-using Workspaces.Data;
 using WorkspacesEditor.Utils;
 
 using static WorkspacesEditor.Data.ProjectData;
@@ -14,13 +12,7 @@ namespace WorkspacesEditor.Data
 {
     public class WorkspacesData : WorkspacesEditorData<WorkspacesListWrapper>
     {
-        public string File
-        {
-            get
-            {
-                return FolderUtils.DataFolder() + "\\workspaces.json";
-            }
-        }
+        public string File => FolderUtils.DataFolder() + "\\workspaces.json";
 
         public struct WorkspacesListWrapper
         {

diff --git a/src/modules/Workspaces/WorkspacesEditor/Data/WorkspacesEditorData`1.cs b/src/modules/Workspaces/WorkspacesEditor/Data/WorkspacesEditorData`1.cs
@@ -3,28 +3,24 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.Json;
-
 using WorkspacesEditor.Utils;
 
-namespace Workspaces.Data
+namespace WorkspacesEditor.Data
 {
     public class WorkspacesEditorData<T>
     {
         protected JsonSerializerOptions JsonOptions
         {
-            get
+            get => new()
             {
-                return new JsonSerializerOptions
-                {
-                    PropertyNamingPolicy = new DashCaseNamingPolicy(),
-                    WriteIndented = true,
-                };
-            }
+                PropertyNamingPolicy = new DashCaseNamingPolicy(),
+                WriteIndented = true,
+            };
         }
 
         public T Read(string file)
         {
-            IOUtils ioUtils = new IOUtils();
+            IOUtils ioUtils = new();
             string data = ioUtils.ReadFile(file);
             return JsonSerializer.Deserialize<T>(data, JsonOptions);
         }

diff --git a/src/modules/Workspaces/WorkspacesEditor/MainWindow.xaml b/src/modules/Workspaces/WorkspacesEditor/MainWindow.xaml
@@ -8,7 +8,7 @@
     xmlns:ui="http://schemas.modernwpf.com/2019"
     x:Name="WorkspacesMainWindow"
     Title="{x:Static props:Resources.MainTitle}"
-    MinWidth="700"
+    MinWidth="750"
     MinHeight="680"
     ui:TitleBar.Background="{DynamicResource PrimaryBackgroundBrush}"
     ui:TitleBar.InactiveBackground="{DynamicResource TertiaryBackgroundBrush}"

diff --git a/src/modules/Workspaces/WorkspacesEditor/Models/AppListDataTemplateSelector.cs b/src/modules/Workspaces/WorkspacesEditor/Models/AppListDataTemplateSelector.cs
@@ -18,14 +18,7 @@ public AppListDataTemplateSelector()
 
         public override System.Windows.DataTemplate SelectTemplate(object item, System.Windows.DependencyObject container)
         {
-            if (item is MonitorHeaderRow)
-            {
-                return HeaderTemplate;
-            }
-            else
-            {
-                return AppTemplate;
-            }
+            return item is MonitorHeaderRow ? HeaderTemplate : AppTemplate;
         }
     }
 }
diff --git a/src/modules/Workspaces/WorkspacesEditor/Models/Application.cs b/src/modules/Workspaces/WorkspacesEditor/Models/Application.cs
@@ -1,25 +1,22 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.ComponentModel;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
 using System.Globalization;
-using System.IO;
-using System.Linq;
 using System.Text.Json.Serialization;
-using System.Text.RegularExpressions;
-using System.Windows.Media.Imaging;
-using ManagedCommon;
-using Windows.Management.Deployment;
-using WorkspacesCsharpLibrary;
 using WorkspacesCsharpLibrary.Models;
 
 namespace WorkspacesEditor.Models
 {
+    public enum WindowPositionKind
+    {
+        Custom = 0,
+        Maximized = 1,
+        Minimized = 2,
+    }
+
     public class Application : BaseApplication, IDisposable
     {
         private bool _isInitialized;
@@ -79,7 +76,7 @@ public struct WindowPosition
                 return left.X != right.X || left.Y != right.Y || left.Width != right.Width || left.Height != right.Height;
             }
 
-            public override bool Equals(object obj)
+            public override readonly bool Equals(object obj)
             {
                 if (obj == null || GetType() != obj.GetType())
                 {
@@ -90,7 +87,7 @@ public override bool Equals(object obj)
                 return X == pos.X && Y == pos.Y && Width == pos.Width && Height == pos.Height;
             }
 
-            public override int GetHashCode()
+            public override readonly int GetHashCode()
             {
                 return base.GetHashCode();
             }
@@ -136,36 +133,24 @@ private void RedrawPreviewImage()
             }
         }
 
-        private bool _minimized;
+        public bool Minimized { get; set; }
 
-        public bool Minimized
-        {
-            get => _minimized;
-            set
-            {
-                _minimized = value;
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(Minimized)));
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(EditPositionEnabled)));
-                RedrawPreviewImage();
-            }
-        }
+        public bool Maximized { get; set; }
 
-        private bool _maximized;
+        public bool EditPositionEnabled => !Minimized && !Maximized;
 
-        public bool Maximized
+        public int PositionComboboxIndex
         {
-            get => _maximized;
+            get => Maximized ? (int)WindowPositionKind.Maximized : Minimized ? (int)WindowPositionKind.Minimized : (int)WindowPositionKind.Custom;
             set
             {
-                _maximized = value;
-                OnPropertyChanged(new PropertyChangedEventArgs(nameof(Maximized)));
+                Maximized = value == (int)WindowPositionKind.Maximized;
+                Minimized = value == (int)WindowPositionKind.Minimized;
                 OnPropertyChanged(new PropertyChangedEventArgs(nameof(EditPositionEnabled)));
                 RedrawPreviewImage();
             }
         }
 
-        public bool EditPositionEnabled { get => !Minimized && !Maximized; }
-
         private string _appMainParams;
 
         public string AppMainParams
@@ -183,7 +168,7 @@ public string AppMainParams
             }
         }
 
-        public bool IsAppMainParamVisible { get => !string.IsNullOrWhiteSpace(_appMainParams); }
+        public bool IsAppMainParamVisible => !string.IsNullOrWhiteSpace(_appMainParams);
 
         [JsonIgnore]
         public bool IsHighlighted { get; set; }
@@ -192,13 +177,7 @@ public string AppMainParams
         public int RepeatIndex { get; set; }
 
         [JsonIgnore]
-        public string RepeatIndexString
-        {
-            get
-            {
-                return RepeatIndex <= 1 ? string.Empty : RepeatIndex.ToString(CultureInfo.InvariantCulture);
-            }
-        }
+        public string RepeatIndexString => RepeatIndex <= 1 ? string.Empty : RepeatIndex.ToString(CultureInfo.InvariantCulture);
 
         private WindowPosition _position;
 
@@ -242,10 +221,7 @@ public MonitorSetup MonitorSetup
         {
             get
             {
-                if (_monitorSetup == null)
-                {
-                    _monitorSetup = Parent.GetMonitorForApp(this);
-                }
+                _monitorSetup ??= Parent.GetMonitorForApp(this);
 
                 return _monitorSetup;
             }
@@ -271,7 +247,7 @@ public bool IsExpanded
             }
         }
 
-        public string DeleteButtonContent { get => _isIncluded ? Properties.Resources.Delete : Properties.Resources.AddBack; }
+        public string DeleteButtonContent => _isIncluded ? Properties.Resources.Delete : Properties.Resources.AddBack;
 
         private bool _isIncluded = true;
 
@@ -298,15 +274,5 @@ internal void CommandLineTextChanged(string newCommandLineValue)
             CommandLineArguments = newCommandLineValue;
             OnPropertyChanged(new PropertyChangedEventArgs(nameof(AppMainParams)));
         }
-
-        internal void MaximizedChecked()
-        {
-            Minimized = false;
-        }
-
-        internal void MinimizedChecked()
-        {
-            Maximized = false;
-        }
     }
 }
diff --git a/src/modules/Workspaces/WorkspacesEditor/Models/Monitor.cs b/src/modules/Workspaces/WorkspacesEditor/Models/Monitor.cs
@@ -6,28 +6,18 @@
 
 namespace WorkspacesEditor.Models
 {
-    public class Monitor
+    public class Monitor(string monitorName, string monitorInstanceId, int number, int dpi, Rect dpiAwareBounds, Rect dpiUnawareBounds)
     {
-        public string MonitorName { get; private set; }
+        public string MonitorName { get; private set; } = monitorName;
 
-        public string MonitorInstanceId { get; private set; }
+        public string MonitorInstanceId { get; private set; } = monitorInstanceId;
 
-        public int MonitorNumber { get; private set; }
+        public int MonitorNumber { get; private set; } = number;
 
-        public int Dpi { get; private set; }
+        public int Dpi { get; private set; } = dpi;
 
-        public Rect MonitorDpiUnawareBounds { get; private set; }
+        public Rect MonitorDpiUnawareBounds { get; private set; } = dpiUnawareBounds;
 
-        public Rect MonitorDpiAwareBounds { get; private set; }
-
-        public Monitor(string monitorName, string monitorInstanceId, int number, int dpi, Rect dpiAwareBounds, Rect dpiUnawareBounds)
-        {
-            MonitorName = monitorName;
-            MonitorInstanceId = monitorInstanceId;
-            MonitorNumber = number;
-            Dpi = dpi;
-            MonitorDpiAwareBounds = dpiAwareBounds;
-            MonitorDpiUnawareBounds = dpiUnawareBounds;
-        }
+        public Rect MonitorDpiAwareBounds { get; private set; } = dpiAwareBounds;
     }
 }
diff --git a/src/modules/Workspaces/WorkspacesEditor/Models/MonitorSetup.cs b/src/modules/Workspaces/WorkspacesEditor/Models/MonitorSetup.cs
@@ -16,9 +16,9 @@ public void OnPropertyChanged(PropertyChangedEventArgs e)
             PropertyChanged?.Invoke(this, e);
         }
 
-        public string MonitorInfo { get => MonitorName; }
+        public string MonitorInfo => MonitorName;
 
-        public string MonitorInfoWithResolution { get => $"{MonitorName}    {MonitorDpiAwareBounds.Width}x{MonitorDpiAwareBounds.Height}"; }
+        public string MonitorInfoWithResolution => $"{MonitorName}    {MonitorDpiAwareBounds.Width}x{MonitorDpiAwareBounds.Height}";
 
         public MonitorSetup(string monitorName, string monitorInstanceId, int number, int dpi, Rect dpiAwareBounds, Rect dpiUnawareBounds)
             : base(monitorName, monitorInstanceId, number, dpi, dpiAwareBounds, dpiUnawareBounds)