From f049cc58390bee8e7c591330f99a59555b24c632 Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Tue, 10 Mar 2026 11:37:09 +0100 Subject: [PATCH] Setting MinWidth on Shortcut user control (#46035) Closes: #45683 --- .../Controls/ShortcutControl/ShortcutControl.xaml | 1 + .../SettingsXAML/Panels/MouseJumpPanel.xaml | 2 +- .../SettingsXAML/Views/AdvancedPastePage.xaml | 4 ++-- .../SettingsXAML/Views/AlwaysOnTopPage.xaml | 2 +- .../SettingsXAML/Views/ColorPickerPage.xaml | 2 +- .../SettingsXAML/Views/FancyZonesPage.xaml | 6 +++--- .../SettingsXAML/Views/MouseUtilsPage.xaml | 10 +++++----- .../Settings.UI/SettingsXAML/Views/PeekPage.xaml | 2 +- .../SettingsXAML/Views/PowerDisplayPage.xaml | 2 +- .../SettingsXAML/Views/PowerLauncherPage.xaml | 2 +- .../SettingsXAML/Views/ShortcutGuidePage.xaml | 2 +- .../SettingsXAML/Views/WorkspacesPage.xaml | 2 +- .../Settings.UI/SettingsXAML/Views/ZoomItPage.xaml | 14 +++++++------- 13 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml index 273c0b49a5..585af5c38b 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml @@ -9,6 +9,7 @@ xmlns:ptcontrols="using:Microsoft.PowerToys.Common.UI.Controls" xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters" x:Name="LayoutRoot" + MinWidth="{StaticResource SettingActionControlMinWidth}" d:DesignHeight="300" d:DesignWidth="400" mc:Ignorable="d"> diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml index a0725c0149..2bd9889f46 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml @@ -39,7 +39,7 @@ x:Uid="MouseUtils_MouseJump_ActivationShortcut" HeaderIcon="{ui:FontIcon Glyph=}" IsEnabled="{x:Bind ViewModel.IsMouseJumpEnabled, Mode=OneWay}"> - + - + @@ -195,7 +195,7 @@ Name="PasteAsPlainTextShortcut" x:Uid="PasteAsPlainText_Shortcut" HeaderIcon="{ui:FontIcon Glyph=}"> - + - + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml index fbf610b34f..93c2c34e04 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml @@ -32,7 +32,7 @@ Name="ActivationShortcut" x:Uid="Activation_Shortcut" HeaderIcon="{ui:FontIcon Glyph=}"> - + - + - + - + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml index 794cc2055b..4d5cd9bc4d 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml @@ -39,7 +39,7 @@ x:Uid="MouseUtils_CursorWrap_ActivationShortcut" HeaderIcon="{ui:FontIcon Glyph=}" IsEnabled="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=OneWay}"> - + @@ -145,7 +145,7 @@ HeaderIcon="{ui:FontIcon Glyph=}" Visibility="{x:Bind ViewModel.FindMyMouseActivationMethod, Converter={StaticResource IndexBitFieldToVisibilityConverter}, Mode=OneWay, ConverterParameter=0x8}"> - + @@ -256,7 +256,7 @@ AutomationProperties.AutomationId="MouseUtils_MouseHighlighterActivationShortcutId" HeaderIcon="{ui:FontIcon Glyph=}" IsEnabled="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=OneWay}"> - + @@ -338,7 +338,7 @@ x:Uid="MouseUtils_MousePointerCrosshairs_ActivationShortcut" HeaderIcon="{ui:FontIcon Glyph=}" IsEnabled="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=OneWay}"> - + @@ -436,7 +436,7 @@ x:Uid="MouseUtils_GlidingCursor" HeaderIcon="{ui:FontIcon Glyph=}" IsEnabled="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=OneWay}"> - + - + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerDisplayPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerDisplayPage.xaml index 899295ec66..218c4e199e 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerDisplayPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerDisplayPage.xaml @@ -27,7 +27,7 @@ - + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml index 23da2b2449..79e9212767 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml @@ -340,7 +340,7 @@ x:Uid="Activation_Shortcut" HeaderIcon="{ui:FontIcon Glyph=}" IsExpanded="True"> - + diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml index 39429b14ab..488c808230 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml @@ -35,7 +35,7 @@ x:Uid="Activation_Shortcut" HeaderIcon="{ui:FontIcon Glyph=}" Visibility="{x:Bind ViewModel.UseLegacyPressWinKeyBehavior, Mode=OneWay, Converter={StaticResource ReverseBoolToVisibilityConverter}}"> - + - + - + @@ -81,7 +81,7 @@ x:Uid="ZoomIt_LiveZoom_Shortcut" HeaderIcon="{ui:FontIcon Glyph=}" IsExpanded="True"> - + @@ -97,7 +97,7 @@ x:Uid="ZoomIt_Draw_Shortcut" HeaderIcon="{ui:FontIcon Glyph=}" IsExpanded="True"> - + @@ -138,7 +138,7 @@ x:Uid="ZoomIt_DemoType_Shortcut" HeaderIcon="{ui:FontIcon Glyph=}" IsExpanded="True"> - + - + - + - +