Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 20:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FZEditor][Accessibility] Replace NumberBox with Slider (#21382)

Browse Source 
* replaced number boxes

* rename resource

* correct announcement

* Remove NumberBox again
This commit is contained in:
Seraphima Zykova
2022-10-25 22:09:25 +02:00
committed by GitHub
parent aa6910acb1
commit e171264dc2
7 changed files with 188 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/fancyzones/editor/FancyZonesEditor/Controls/CustomSliderAutomationPeer.cs
View File

@@ -10,14 +10,18 @@ namespace FancyZonesEditor.Controls
internal class CustomSliderAutomationPeer : SliderAutomationPeer internal class CustomSliderAutomationPeer : SliderAutomationPeer
{ {
private string name = string.Empty;
public CustomSliderAutomationPeer(Slider owner) public CustomSliderAutomationPeer(Slider owner)
: base(owner) : base(owner)
{ {
name = GetHelpText();
} }
protected override string GetNameCore() protected override string GetNameCore()
{ {
var element = this.Owner as Slider; var element = this.Owner as Slider;
if (element == null) if (element == null)
{ {
return string.Empty; return string.Empty;
@@ -25,7 +29,8 @@ namespace FancyZonesEditor.Controls
string announce = string.Format( string announce = string.Format(
CultureInfo.CurrentCulture, CultureInfo.CurrentCulture,
Properties.Resources.Distance_adjacent_zones_slider_announce, Properties.Resources.Custom_slider_announce,
name,
element.Minimum, element.Minimum,
element.Maximum, element.Maximum,
element.Value); element.Value);

126
src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
View File

@@ -527,16 +527,42 @@
ToolTip="{x:Static props:Resources.Number_of_zones}" ToolTip="{x:Static props:Resources.Number_of_zones}"
Text="" /> Text="" />
<ui:NumberBox Minimum="1" <StackPanel Orientation="Vertical">
Maximum="128" <TextBlock Text="{x:Static props:Resources.Number_of_zones}"
Width="216" x:Name="templateZoneCountTitle"
KeyDown="EditDialogNumberBox_KeyDown" Margin="12,0,0,4"
Margin="12,0,0,0" TextWrapping="Wrap" />
Header="{x:Static props:Resources.Number_of_zones}"
Loaded="NumberBox_Loaded" <StackPanel Orientation="Horizontal">
AutomationProperties.Name="{x:Static props:Resources.Number_of_zones}" <fancyZonesControls:CustomSlider x:Name="TemplateZoneCount"
SpinButtonPlacementMode="Compact" Value="{Binding TemplateZoneCount}"
Text="{Binding TemplateZoneCount}" /> Minimum="{Binding TemplateZoneCountMinimum}"
Maximum="{Binding TemplateZoneCountMaximum}"
IsMoveToPointEnabled="True"
AutomationProperties.HelpText="{x:Static props:Resources.Number_of_zones}"
ToolTip="{Binding TemplateZoneCount}"
ValueChanged="TemplateZoneCount_ValueChanged"
MinWidth="216"
Margin="12,0,0,0"
HorizontalAlignment="Left"
SmallChange="1"
LargeChange="10"/>
<TextBlock Text="{Binding TemplateZoneCount}"
Margin="6,0,0,0"
FontSize="12"
Foreground="{DynamicResource SecondaryForegroundBrush}"
TextWrapping="Wrap"
VerticalAlignment="Center" />
<TextBlock Text="{x:Static props:Resources.Zones}"
Margin="6,0,0,0"
FontSize="12"
Foreground="{DynamicResource SecondaryForegroundBrush}"
TextWrapping="Wrap"
VerticalAlignment="Center" />
</StackPanel>
</StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="0, 12, 0, 0" <StackPanel Margin="0, 12, 0, 0"
@@ -553,25 +579,36 @@
ToolTip="{x:Static props:Resources.Space_Around_Zones}" ToolTip="{x:Static props:Resources.Space_Around_Zones}"
Text="&#xE91B;" /> Text="&#xE91B;" />
<ui:NumberBox Margin="12,0,0,0" <StackPanel Orientation="Horizontal">
IsEnabled="{Binding ShowSpacing}" <fancyZonesControls:CustomSlider x:Name="Spacing"
Text="{Binding Spacing}" Value="{Binding Spacing}"
Width="216" Minimum="{Binding SpacingMinimum}"
Minimum="-20" Maximum="{Binding SpacingMaximum}"
Maximum="1000" IsMoveToPointEnabled="True"
KeyDown="EditDialogNumberBox_KeyDown" AutomationProperties.HelpText="{x:Static props:Resources.Space_Around_Zones}"
SpinButtonPlacementMode="Compact" ToolTip="{Binding Spacing}"
HorizontalAlignment="Left" ValueChanged="Spacing_ValueChanged"
VerticalAlignment="Center" IsEnabled="{Binding ShowSpacing}"
Loaded="NumberBox_Loaded" MinWidth="216"
AutomationProperties.Name="{x:Static props:Resources.Space_Around_Zones}" Margin="12,0,0,0"
AutomationProperties.LabeledBy="{Binding ElementName=spacingTitle}" /> HorizontalAlignment="Left"
<TextBlock Text="{x:Static props:Resources.Pixels}" SmallChange="1"
Margin="6,-4,0,0" LargeChange="10"/>
<TextBlock Text="{Binding Spacing}"
Margin="6,0,0,0"
FontSize="12"
Foreground="{DynamicResource SecondaryForegroundBrush}"
TextWrapping="Wrap"
VerticalAlignment="Center"/>
<TextBlock Text="{x:Static props:Resources.Pixels}"
Margin="6,0,0,0"
FontSize="12" FontSize="12"
Foreground="{DynamicResource SecondaryForegroundBrush}" Foreground="{DynamicResource SecondaryForegroundBrush}"
TextWrapping="Wrap" TextWrapping="Wrap"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
</StackPanel>
<ui:ToggleSwitch x:Name="spaceAroundSetting" <ui:ToggleSwitch x:Name="spaceAroundSetting"
IsOn="{Binding ShowSpacing}" IsOn="{Binding ShowSpacing}"
@@ -585,7 +622,7 @@
<sys:Double x:Key="ToggleSwitchThemeMinWidth">0</sys:Double> <sys:Double x:Key="ToggleSwitchThemeMinWidth">0</sys:Double>
</ui:ToggleSwitch.Resources> </ui:ToggleSwitch.Resources>
</ui:ToggleSwitch> </ui:ToggleSwitch>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
@@ -606,8 +643,7 @@
Minimum="{Binding SensitivityRadiusMinimum}" Minimum="{Binding SensitivityRadiusMinimum}"
Maximum="{Binding SensitivityRadiusMaximum}" Maximum="{Binding SensitivityRadiusMaximum}"
IsMoveToPointEnabled="True" IsMoveToPointEnabled="True"
AutomationProperties.Name="{x:Static props:Resources.Distance_adjacent_zones}" AutomationProperties.HelpText="{x:Static props:Resources.Distance_adjacent_zones}"
AutomationProperties.HelpText="{Binding SensitivityRadius}"
ToolTip="{Binding SensitivityRadius}" ToolTip="{Binding SensitivityRadius}"
ValueChanged="SensitivityInput_ValueChanged" ValueChanged="SensitivityInput_ValueChanged"
MinWidth="216" MinWidth="216"
@@ -619,13 +655,14 @@
<TextBlock <TextBlock
Text="{Binding SensitivityRadius}" Text="{Binding SensitivityRadius}"
Margin="6,8,0,0" Margin="6,0,0,0"
FontSize="12" FontSize="12"
Foreground="{DynamicResource SecondaryForegroundBrush}" Foreground="{DynamicResource SecondaryForegroundBrush}"
TextWrapping="Wrap" /> TextWrapping="Wrap"
VerticalAlignment="Center"/>
<TextBlock Text="{x:Static props:Resources.Pixels}" <TextBlock Text="{x:Static props:Resources.Pixels}"
Margin="6,-4,0,0" Margin="6,0,0,0"
FontSize="12" FontSize="12"
Foreground="{DynamicResource SecondaryForegroundBrush}" Foreground="{DynamicResource SecondaryForegroundBrush}"
TextWrapping="Wrap" TextWrapping="Wrap"
@@ -633,33 +670,6 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"
HorizontalAlignment="Left"
Margin="0,16,0,0"
Visibility="{Binding Path=Type, Converter={StaticResource LayoutTypeTemplateToVisibilityConverter}}">
<TextBlock FontFamily="Segoe MDL2 Assets"
VerticalAlignment="Center"
FontSize="16"
Margin="0,16,0,0"
AutomationProperties.Name="{x:Static props:Resources.Number_of_zones}"
ToolTip="{x:Static props:Resources.Number_of_zones}"
Text="&#xECA5;" />
<ui:NumberBox Minimum="1"
Maximum="128"
Width="216"
KeyDown="EditDialogNumberBox_KeyDown"
Margin="12,0,0,0"
Header="{x:Static props:Resources.Number_of_zones}"
Loaded="NumberBox_Loaded"
AutomationProperties.Name="{x:Static props:Resources.Number_of_zones}"
SpinButtonPlacementMode="Compact"
Text="{Binding TemplateZoneCount}" />
</StackPanel>
<StackPanel Orientation="Vertical" <StackPanel Orientation="Vertical"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="0,16,0,0"> Margin="0,16,0,0">

44
src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
View File

@@ -587,7 +587,49 @@ namespace FancyZonesEditor
FrameworkElementAutomationPeer.FromElement(SensitivityInput) as SliderAutomationPeer; FrameworkElementAutomationPeer.FromElement(SensitivityInput) as SliderAutomationPeer;
string activityId = "sliderValueChanged"; string activityId = "sliderValueChanged";
string value = string.Format(CultureInfo.CurrentCulture, Properties.Resources.Slider_Value, SensitivityInput.Value); string value = string.Format(CultureInfo.CurrentCulture, Properties.Resources.Pixel_Value, SensitivityInput.Value);
if (peer != null && value != null)
{
peer.RaiseNotificationEvent(
AutomationNotificationKind.ActionCompleted,
AutomationNotificationProcessing.ImportantMostRecent,
value,
activityId);
}
}
}
private void TemplateZoneCount_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
{
if (AutomationPeer.ListenerExists(AutomationEvents.PropertyChanged))
{
SliderAutomationPeer peer =
FrameworkElementAutomationPeer.FromElement(TemplateZoneCount) as SliderAutomationPeer;
string activityId = "templateZoneCountValueChanged";
string value = string.Format(CultureInfo.CurrentCulture, Properties.Resources.Template_Zone_Count_Value, TemplateZoneCount.Value);
if (peer != null && value != null)
{
peer.RaiseNotificationEvent(
AutomationNotificationKind.ActionCompleted,
AutomationNotificationProcessing.ImportantMostRecent,
value,
activityId);
}
}
}
private void Spacing_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
{
if (AutomationPeer.ListenerExists(AutomationEvents.PropertyChanged))
{
SliderAutomationPeer peer =
FrameworkElementAutomationPeer.FromElement(Spacing) as SliderAutomationPeer;
string activityId = "spacingValueChanged";
string value = string.Format(CultureInfo.CurrentCulture, Properties.Resources.Pixel_Value, Spacing.Value);
if (peer != null && value != null) if (peer != null && value != null)
{ {

10
src/modules/fancyzones/editor/FancyZonesEditor/Models/GridLayoutModel.cs
View File

@@ -119,6 +119,16 @@ namespace FancyZonesEditor.Models
} }
} }
public int SpacingMinimum
{
get { return -10; }
}
public int SpacingMaximum
{
get { return 1000; }
}
private int _spacing = LayoutSettings.DefaultSpacing; private int _spacing = LayoutSettings.DefaultSpacing;
public GridLayoutModel() public GridLayoutModel()

16
src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs
View File

@@ -288,6 +288,22 @@ namespace FancyZonesEditor.Models
} }
} }
public int TemplateZoneCountMinimum
{
get
{
return 1;
}
}
public int TemplateZoneCountMaximum
{
get
{
return 128;
}
}
private int _zoneCount = LayoutSettings.DefaultZoneCount; private int _zoneCount = LayoutSettings.DefaultZoneCount;
public bool IsZoneAddingAllowed public bool IsZoneAddingAllowed

54
src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.Designer.cs generated
View File

@@ -213,6 +213,15 @@ namespace FancyZonesEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to {0} slider. Possible range is from {1} to {2}. Value is {3}..
/// </summary>
public static string Custom_slider_announce {
get {
return ResourceManager.GetString("Custom_slider_announce", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Custom layout. /// Looks up a localized string similar to Custom layout.
/// </summary> /// </summary>
@@ -316,15 +325,6 @@ namespace FancyZonesEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Highlight distance slider. Possible range is from {0} to {1}. Value is {2}..
/// </summary>
public static string Distance_adjacent_zones_slider_announce {
get {
return ResourceManager.GetString("Distance_adjacent_zones_slider_announce", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Duplicate. /// Looks up a localized string similar to Duplicate.
/// </summary> /// </summary>
@@ -717,6 +717,15 @@ namespace FancyZonesEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to {0} pixels.
/// </summary>
public static string Pixel_Value {
get {
return ResourceManager.GetString("Pixel_Value", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to px. /// Looks up a localized string similar to px.
/// </summary> /// </summary>
@@ -825,15 +834,6 @@ namespace FancyZonesEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to {0} pixels.
/// </summary>
public static string Slider_Value {
get {
return ResourceManager.GetString("Slider_Value", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Space around zones. /// Looks up a localized string similar to Space around zones.
/// </summary> /// </summary>
@@ -915,6 +915,15 @@ namespace FancyZonesEditor.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to {0} zones.
/// </summary>
public static string Template_Zone_Count_Value {
get {
return ResourceManager.GetString("Template_Zone_Count_Value", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Templates. /// Looks up a localized string similar to Templates.
/// </summary> /// </summary>
@@ -941,5 +950,14 @@ namespace FancyZonesEditor.Properties {
return ResourceManager.GetString("Zone_Count_Increment", resourceCulture); return ResourceManager.GetString("Zone_Count_Increment", resourceCulture);
} }
} }
/// <summary>
/// Looks up a localized string similar to zones.
/// </summary>
public static string Zones {
get {
return ResourceManager.GetString("Zones", resourceCulture);
}
}
} }
} }

12
src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx
View File

@@ -408,12 +408,18 @@
<data name="Error_Parsing_Custom_Layouts_Message" xml:space="preserve"> <data name="Error_Parsing_Custom_Layouts_Message" xml:space="preserve">
<value>An error occurred while parsing custom layouts.</value> <value>An error occurred while parsing custom layouts.</value>
</data> </data>
<data name="Distance_adjacent_zones_slider_announce" xml:space="preserve"> <data name="Custom_slider_announce" xml:space="preserve">
<value>Highlight distance slider. Possible range is from {0} to {1}. Value is {2}.</value> <value>{0} slider. Possible range is from {1} to {2}. Value is {3}.</value>
</data> </data>
<data name="Slider_Value" xml:space="preserve"> <data name="Pixel_Value" xml:space="preserve">
<value>{0} pixels</value> <value>{0} pixels</value>
</data> </data>
<data name="Template_Zone_Count_Value" xml:space="preserve">
<value>{0} zones</value>
</data>
<data name="Zones" xml:space="preserve">
<value>zones</value>
</data>
<data name="Default_Layout_Horizontal" xml:space="preserve"> <data name="Default_Layout_Horizontal" xml:space="preserve">
<value>Default layout for horizontal monitor orientation</value> <value>Default layout for horizontal monitor orientation</value>
</data> </data>