Merge branch 'main' into terminal

yaira2 · web-flow · commit b25fe52e47bd · 2024-06-18T21:57:19.000-04:00
diff --git a/src/Files.App/Utils/Global/WallpaperHelpers.cs b/src/Files.App/Utils/Global/WallpaperHelpers.cs
@@ -19,8 +19,13 @@ public static async Task SetAsBackgroundAsync(WallpaperType type, string filePat
 				{
 					// Set the desktop background
 					var wallpaper = (Shell32.IDesktopWallpaper)new Shell32.DesktopWallpaper();
-					wallpaper.GetMonitorDevicePathAt(0, out var monitorId);
-					wallpaper.SetWallpaper(monitorId, filePath);
+					var monitorCount = wallpaper.GetMonitorDevicePathCount();
+
+					for (uint i = 0; i < monitorCount; i++)
+					{
+						wallpaper.GetMonitorDevicePathAt(i, out var monitorId);
+						wallpaper.SetWallpaper(monitorId, filePath);
+					}
 				}
 				else if (type == WallpaperType.LockScreen)
 				{

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,13 @@ public static async Task SetAsBackgroundAsync(WallpaperType type, string filePat`
`19`	`19`	`{`
`20`	`20`	`// Set the desktop background`
`21`	`21`	`var wallpaper = (Shell32.IDesktopWallpaper)new Shell32.DesktopWallpaper();`
`22`		`- wallpaper.GetMonitorDevicePathAt(0, out var monitorId);`
`23`		`- wallpaper.SetWallpaper(monitorId, filePath);`
	`22`	`+ var monitorCount = wallpaper.GetMonitorDevicePathCount();`
	`23`	`+`
	`24`	`+ for (uint i = 0; i < monitorCount; i++)`
	`25`	`+ {`
	`26`	`+ wallpaper.GetMonitorDevicePathAt(i, out var monitorId);`
	`27`	`+ wallpaper.SetWallpaper(monitorId, filePath);`
	`28`	`+ }`
`24`	`29`	`}`
`25`	`30`	`else if (type == WallpaperType.LockScreen)`
`26`	`31`	`{`