From aa460eb149501617bd7bf2b35914e25c0ac222c2 Mon Sep 17 00:00:00 2001
From: Dave Rayment <dave.rayment@gmail.com>
Date: Sun, 8 Mar 2026 01:24:45 +0000
Subject: [PATCH 1/2] Fix Quick Accent language list being cut off and resizing
 not formatting contents.

---
 .../SettingsXAML/Views/PowerAccentPage.xaml   | 19 +++++++++--------
 .../Views/PowerAccentPage.xaml.cs             | 21 +++++++++++++++++++
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
index d8d76463a5d3..bf181af71899 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
@@ -70,7 +70,12 @@
                             IsThreeState="True"
                             Unchecked="QuickAccent_SelectedLanguage_UnselectAll" />
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard
+                                x:Name="LanguageSettingsCard"
+                                HorizontalContentAlignment="Stretch"
+                                ContentAlignment="Left"
+                                Loaded="LanguageSettingsCard_Loaded"
+                                SizeChanged="LanguageSettingsCard_SizeChanged">
                                 <ListView
                                     x:Name="QuickAccent_Language_Select"
                                     MinWidth="{StaticResource SettingActionControlMinWidth}"
@@ -80,22 +85,18 @@
                                     ItemTemplate="{StaticResource LanguageViewTemplate}"
                                     ItemsSource="{x:Bind LanguagesCustomViewSource.View, Mode=OneWay}"
                                     Loaded="QuickAccent_Language_Select_Loaded"
-                                    ScrollViewer.HorizontalScrollBarVisibility="Visible"
-                                    ScrollViewer.HorizontalScrollMode="Enabled"
-                                    ScrollViewer.VerticalScrollBarVisibility="Visible"
-                                    ScrollViewer.VerticalScrollMode="Enabled"
+                                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                                    ScrollViewer.VerticalScrollMode="Disabled"
                                     SelectionChanged="QuickAccent_SelectedLanguage_SelectionChanged"
                                     SelectionMode="Multiple">
                                     <ListView.ItemsPanel>
                                         <ItemsPanelTemplate>
-                                            <ItemsWrapGrid
-                                                MaxWidth="{Binding ElementName=QuickAccent_Language, Path=ActualWidth}"
-                                                ItemWidth="280"
-                                                Orientation="Horizontal" />
+                                            <ItemsWrapGrid ItemWidth="280" Orientation="Horizontal" />
                                         </ItemsPanelTemplate>
                                     </ListView.ItemsPanel>
                                     <ListView.ItemContainerStyle>
                                         <Style TargetType="ListViewItem">
+                                            <Setter Property="Width" Value="280" />
                                             <Setter Property="Template">
                                                 <Setter.Value>
                                                     <ControlTemplate TargetType="ListViewItem">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs
index 0f60a8dcd348..9322125617d6 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs
@@ -91,5 +91,26 @@ private void QuickAccent_Language_Select_Loaded(object sender, RoutedEventArgs e
 
             loadingLanguageListDontTriggerSelectionChanged = false;
         }
+
+        private void LanguageSettingsCard_Loaded(object sender, RoutedEventArgs e)
+        {
+            UpdateLanguageListMaxWidth(sender as Control);
+        }
+
+        private void LanguageSettingsCard_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            UpdateLanguageListMaxWidth(sender as Control);
+        }
+
+        private void UpdateLanguageListMaxWidth(Control card)
+        {
+            if (card is null)
+            {
+                return;
+            }
+
+            QuickAccent_Language_Select.MaxWidth =
+                card.ActualWidth - card.Padding.Left - card.Padding.Right;
+        }
     }
 }

From f994129ff3d711e42718ae0bd7902ed6d5747e6d Mon Sep 17 00:00:00 2001
From: Dave Rayment <dave.rayment@gmail.com>
Date: Mon, 9 Mar 2026 21:45:22 +0000
Subject: [PATCH 2/2] Add defensive check to prevent potential negative width
 for the language lists. Add comments. Remove redundant
 ItemsWrapGrid.ItemWidth.

---
 .../SettingsXAML/Views/PowerAccentPage.xaml          |  2 +-
 .../SettingsXAML/Views/PowerAccentPage.xaml.cs       | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
index bf181af71899..6c92b827b903 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
@@ -91,7 +91,7 @@
                                     SelectionMode="Multiple">
                                     <ListView.ItemsPanel>
                                         <ItemsPanelTemplate>
-                                            <ItemsWrapGrid ItemWidth="280" Orientation="Horizontal" />
+                                            <ItemsWrapGrid Orientation="Horizontal" />
                                         </ItemsPanelTemplate>
                                     </ListView.ItemsPanel>
                                     <ListView.ItemContainerStyle>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs
index 9322125617d6..7809a2025195 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs
@@ -1,6 +1,7 @@
 // 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.Linq;
 using CommunityToolkit.WinUI;
 using Microsoft.PowerToys.Settings.UI.Helpers;
@@ -102,6 +103,11 @@ private void LanguageSettingsCard_SizeChanged(object sender, SizeChangedEventArg
             UpdateLanguageListMaxWidth(sender as Control);
         }
 
+        /// <summary>
+        /// Constrain the character set lists to the width of the parent card to permit
+        /// column reflow.
+        /// </summary>
+        /// <param name="card">The parent SettingsCard control.</param>
         private void UpdateLanguageListMaxWidth(Control card)
         {
             if (card is null)
@@ -109,8 +115,12 @@ private void UpdateLanguageListMaxWidth(Control card)
                 return;
             }
 
-            QuickAccent_Language_Select.MaxWidth =
+            double availableWidth =
                 card.ActualWidth - card.Padding.Left - card.Padding.Right;
+
+            QuickAccent_Language_Select.MaxWidth = Math.Max(
+                QuickAccent_Language_Select.MinWidth,
+                availableWidth);
         }
     }
 }