mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 09:28:03 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[FancyZones] Fixed monitor id for unified work areas (#11857)

Browse Source
This commit is contained in:
Seraphima Zykova 2021-06-24 16:30:36 +03:00 committed by GitHub
parent 4aa1e43bac
commit 0f32e99d88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/modules/fancyzones/editor/FancyZonesEditor/Utils/FancyZonesEditorIO.cs
View File

@ -361,7 +361,38 @@ namespace FancyZonesEditor.Utils
} }
else else
{ {
App.Overlay.Monitors[App.Overlay.CurrentDesktop].Device.Id = targetMonitorName; // Monitors count
int count = int.Parse(argsParts[(int)CmdArgs.MonitorsCount], CultureInfo.InvariantCulture);
// Parse the native monitor data
List<NativeMonitorData> nativeMonitorData = new List<NativeMonitorData>();
const int monitorArgsCount = 6;
for (int i = 0; i < count; i++)
{
var nativeData = default(NativeMonitorData);
nativeData.MonitorId = argsParts[(int)CmdArgs.MonitorId + (i * monitorArgsCount)];
nativeData.Dpi = int.Parse(argsParts[(int)CmdArgs.DPI + (i * monitorArgsCount)], CultureInfo.InvariantCulture);
nativeData.LeftCoordinate = int.Parse(argsParts[(int)CmdArgs.MonitorLeft + (i * monitorArgsCount)], CultureInfo.InvariantCulture);
nativeData.TopCoordinate = int.Parse(argsParts[(int)CmdArgs.MonitorTop + (i * monitorArgsCount)], CultureInfo.InvariantCulture);
nativeData.Width = int.Parse(argsParts[(int)CmdArgs.MonitorWidth + (i * monitorArgsCount)], CultureInfo.InvariantCulture);
nativeData.Height = int.Parse(argsParts[(int)CmdArgs.MonitorHeight + (i * monitorArgsCount)], CultureInfo.InvariantCulture);
nativeMonitorData.Add(nativeData);
}
Rect workAreaUnion = default;
// Update monitors data
foreach (NativeMonitorData nativeData in nativeMonitorData)
{
Rect workArea = new Rect(nativeData.LeftCoordinate, nativeData.TopCoordinate, nativeData.Width, nativeData.Height);
workAreaUnion = Rect.Union(workAreaUnion, workArea);
}
var monitor = new Monitor(workAreaUnion, workAreaUnion);
monitor.Device.Id = targetMonitorName;
App.Overlay.Monitors.Add(monitor);
} }
} }
catch (Exception) catch (Exception)
@ -421,15 +452,16 @@ namespace FancyZonesEditor.Utils
} }
else else
{ {
Rect workArea = default; if (editorParams.Monitors.Count != 1)
foreach (NativeMonitorData nativeData in editorParams.Monitors)
{ {
Rect monitorWorkArea = new Rect(nativeData.LeftCoordinate, nativeData.TopCoordinate, nativeData.Width, nativeData.Height); return new ParsingResult(false);
workArea = Rect.Union(workArea, monitorWorkArea);
} }
var nativeData = editorParams.Monitors[0];
Rect workArea = new Rect(nativeData.LeftCoordinate, nativeData.TopCoordinate, nativeData.Width, nativeData.Height);
var monitor = new Monitor(workArea, workArea); var monitor = new Monitor(workArea, workArea);
monitor.Device.Id = nativeData.MonitorId;
App.Overlay.AddMonitor(monitor); App.Overlay.AddMonitor(monitor);
} }
} }