Skip to content

Commit 200ec88

Browse files
committed
fix: Address PR review - add localization, tooltips, accessibility
- Add bounds checking to ToolbarPositionIndex to prevent crash - Add 18 localized resource strings for .ToolTip and .AutomationProperties.Name - Use x:Uid in XAML for proper localization support - Update PR description to match implementation
1 parent caf8b3f commit 200ec88

File tree

2 files changed

+61
-0
lines changed

2 files changed

+61
-0
lines changed

src/settings-ui/Settings.UI/Strings/en-us/Resources.resw

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3507,6 +3507,61 @@ Activate by holding the key for the character you want to add an accent to, then
35073507
<data name="QuickAccent_ToolbarPosition_Right.Content" xml:space="preserve">
35083508
<value>Right</value>
35093509
</data>
3510+
<!-- Toolbar position ToolTip and Accessibility strings -->
3511+
<data name="QuickAccent_ToolbarPosition_TopCenter.ToolTip" xml:space="preserve">
3512+
<value>Top center</value>
3513+
</data>
3514+
<data name="QuickAccent_ToolbarPosition_TopCenter.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
3515+
<value>Top center</value>
3516+
</data>
3517+
<data name="QuickAccent_ToolbarPosition_TopLeftCorner.ToolTip" xml:space="preserve">
3518+
<value>Top left corner</value>
3519+
</data>
3520+
<data name="QuickAccent_ToolbarPosition_TopLeftCorner.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
3521+
<value>Top left corner</value>
3522+
</data>
3523+
<data name="QuickAccent_ToolbarPosition_TopRightCorner.ToolTip" xml:space="preserve">
3524+
<value>Top right corner</value>
3525+
</data>
3526+
<data name="QuickAccent_ToolbarPosition_TopRightCorner.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
3527+
<value>Top right corner</value>
3528+
</data>
3529+
<data name="QuickAccent_ToolbarPosition_BottomLeftCorner.ToolTip" xml:space="preserve">
3530+
<value>Bottom left corner</value>
3531+
</data>
3532+
<data name="QuickAccent_ToolbarPosition_BottomLeftCorner.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
3533+
<value>Bottom left corner</value>
3534+
</data>
3535+
<data name="QuickAccent_ToolbarPosition_BottomCenter.ToolTip" xml:space="preserve">
3536+
<value>Bottom center</value>
3537+
</data>
3538+
<data name="QuickAccent_ToolbarPosition_BottomCenter.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
3539+
<value>Bottom center</value>
3540+
</data>
3541+
<data name="QuickAccent_ToolbarPosition_BottomRightCorner.ToolTip" xml:space="preserve">
3542+
<value>Bottom right corner</value>
3543+
</data>
3544+
<data name="QuickAccent_ToolbarPosition_BottomRightCorner.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
3545+
<value>Bottom right corner</value>
3546+
</data>
3547+
<data name="QuickAccent_ToolbarPosition_Center.ToolTip" xml:space="preserve">
3548+
<value>Center</value>
3549+
</data>
3550+
<data name="QuickAccent_ToolbarPosition_Center.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
3551+
<value>Center</value>
3552+
</data>
3553+
<data name="QuickAccent_ToolbarPosition_Left.ToolTip" xml:space="preserve">
3554+
<value>Left</value>
3555+
</data>
3556+
<data name="QuickAccent_ToolbarPosition_Left.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
3557+
<value>Left</value>
3558+
</data>
3559+
<data name="QuickAccent_ToolbarPosition_Right.ToolTip" xml:space="preserve">
3560+
<value>Right</value>
3561+
</data>
3562+
<data name="QuickAccent_ToolbarPosition_Right.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
3563+
<value>Right</value>
3564+
</data>
35103565
<data name="QuickAccent_Behavior.Header" xml:space="preserve">
35113566
<value>Behavior</value>
35123567
</data>

src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,12 @@ public int ToolbarPositionIndex
284284

285285
set
286286
{
287+
// Validate index is within bounds to prevent crash
288+
if (value < 0 || value >= _toolbarOptions.Length)
289+
{
290+
return;
291+
}
292+
287293
if (_toolbarPositionIndex != value)
288294
{
289295
_toolbarPositionIndex = value;

0 commit comments

Comments
 (0)