diff --git a/src/settings-ui/Settings.UI.Library/Utilities/Helper.cs b/src/settings-ui/Settings.UI.Library/Utilities/Helper.cs index b577dc2102..bd9d98e424 100644 --- a/src/settings-ui/Settings.UI.Library/Utilities/Helper.cs +++ b/src/settings-ui/Settings.UI.Library/Utilities/Helper.cs @@ -7,7 +7,6 @@ using System.Diagnostics; using System.IO; using System.IO.Abstractions; using System.Linq; -using System.Runtime.InteropServices; using Microsoft.PowerToys.Settings.UI.Library.CustomAction; namespace Microsoft.PowerToys.Settings.UI.Library.Utilities @@ -135,5 +134,10 @@ namespace Microsoft.PowerToys.Settings.UI.Library.Utilities } public const uint VirtualKeyWindows = interop.Constants.VK_WIN_BOTH; + + public static bool Windows11() + { + return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= 22000; + } } } diff --git a/src/settings-ui/Settings.UI.Library/ViewModels/FancyZonesViewModel.cs b/src/settings-ui/Settings.UI.Library/ViewModels/FancyZonesViewModel.cs index a6e06ce13c..871b4b4e70 100644 --- a/src/settings-ui/Settings.UI.Library/ViewModels/FancyZonesViewModel.cs +++ b/src/settings-ui/Settings.UI.Library/ViewModels/FancyZonesViewModel.cs @@ -6,6 +6,7 @@ using System; using System.Runtime.CompilerServices; using Microsoft.PowerToys.Settings.UI.Library.Helpers; using Microsoft.PowerToys.Settings.UI.Library.Interfaces; +using Microsoft.PowerToys.Settings.UI.Library.Utilities; using Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands; namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels @@ -26,6 +27,8 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels private string settingsConfigFileFolder = string.Empty; + private bool _windows11; + private enum MoveWindowBehaviour { MoveWindowBasedOnZoneIndex = 0, @@ -112,6 +115,13 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels _zoneNumberColor = !string.IsNullOrEmpty(numberColor) ? numberColor : ConfigDefaults.DefaultFancyzonesNumberColor; _isEnabled = GeneralSettingsConfig.Enabled.FancyZones; + _windows11 = Helper.Windows11(); + + // Disable setting on windows 10 + if (!_windows11 && DisableRoundCornersOnWindowSnap) + { + DisableRoundCornersOnWindowSnap = false; + } } private bool _isEnabled; @@ -846,6 +856,8 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels } } + public bool Windows11 => _windows11; + private void LaunchEditor() { // send message to launch the zones editor; diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw index a73c192b01..90c811313e 100644 --- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw +++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw @@ -1356,7 +1356,7 @@ Made with 💗 by Microsoft and the PowerToys community. Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity. Take a moment to preview the various utilities listed or view our comprehensive documentation. - + Documentation on Microsoft Docs @@ -1474,7 +1474,7 @@ From there, simply click on one of the supported files in the File Explorer and Couldn't load the release notes. - + Please check your internet connection. @@ -2105,10 +2105,7 @@ From there, simply click on one of the supported files in the File Explorer and What's new - - Works on Windows 11 - - + Disable round corners when window is snapped diff --git a/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml b/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml index 8a398c7b43..7dc66c863b 100644 --- a/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml +++ b/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml @@ -14,6 +14,7 @@ + - - + +