Fixed tooltip call out with narrator

This commit is contained in:
Niels Laute
2020-10-23 15:44:31 +02:00
parent 3f4336697e
commit 466a0015e9
2 changed files with 25 additions and 38 deletions

View File

@@ -5,39 +5,26 @@
xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
AutomationProperties.Name="{x:Bind Header, Mode=OneTime}"
mc:Ignorable="d"
AutomationProperties.Name="{x:Bind Header, Mode=OneTime}"
d:DesignHeight="300"
d:DesignWidth="400">
<StackPanel Orientation="Vertical">
<TextBox x:Name="HotkeyTextBox"
x:Uid="SettingsPage_SetShortcut"
AutomationProperties.HelpText="{Binding ElementName=ShortcutWarningLabelText, Path=Text}"
IsReadOnly="True">
<ToolTipService.ToolTip>
<ToolTip>
<TextBlock x:Name="ShortcutWarningLabelText">
<Run x:Uid="ShortcutWarningLabel"/>
<LineBreak/>
<Run Text="{x:Bind Keys, Mode=OneTime}" FontWeight="SemiBold"/>
</TextBlock>
</ToolTip>
<TextBlock x:Name="ShortcutWarningLabelText">
<Run x:Uid="ShortcutWarningLabel"/>
<LineBreak/>
<Run Text="{x:Bind Keys, Mode=OneTime}" FontWeight="SemiBold"/>
</TextBlock>
</ToolTipService.ToolTip>
<StackPanel Orientation="Horizontal">
<TextBlock x:Name="TitleText"
Text="{x:Bind Header, Mode=OneTime}"
Foreground="{Binding Path=IsEnabled, ElementName=HotkeyTextBox, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
/>
<TextBlock AutomationProperties.LabeledBy="{Binding ElementName=ShortcutWarningLabelText}"
x:Name="TitleGlyph" Text="&#xE946;"
FontFamily="Segoe MDL2 Assets"
Margin="4,4,0,0"
Foreground="{Binding Path=IsEnabled, ElementName=HotkeyTextBox, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
/>
</StackPanel>
<TextBox x:Uid="SettingsPage_SetShortcut"
x:Name="HotkeyTextBox"
Margin="0,5,0,0"
IsReadOnly="True"
/>
</StackPanel>
<TextBox.Header>
<TextBlock>
<Run Text="{x:Bind Header, Mode=OneTime}"/>
<Run Text="&#xE946;" FontFamily="Segoe MDL2 Assets"/>
</TextBlock>
</TextBox.Header>
</TextBox>
</UserControl>

View File

@@ -204,10 +204,10 @@
<value>Current Shortcut Remappings</value>
</data>
<data name="KeyboardManager_RemappedKeysListItem.AutomationProperties.Name" xml:space="preserve">
<value>Key Remapping</value>
<value>Key remapping</value>
</data>
<data name="KeyboardManager_RemappedShortcutsListItem.AutomationProperties.Name" xml:space="preserve">
<value>Shortcut Remapping</value>
<value>Shortcut remapping</value>
</data>
<data name="KeyboardManager_RemappedTo.AutomationProperties.Name" xml:space="preserve">
<value>Remapped to</value>
@@ -337,7 +337,7 @@
<value>Open zones editor</value>
</data>
<data name="SettingsPage_SetShortcut.AutomationProperties.Name" xml:space="preserve">
<value>Set shortcut</value>
<value>Enter your shortcut</value>
</data>
<data name="SettingsPage_SetShortcut_Glyph.AutomationProperties.Name" xml:space="preserve">
<value>Information Symbol</value>
@@ -502,7 +502,7 @@
<value>Enable Image Resizer</value>
</data>
<data name="ImagesSizesListView.AutomationProperties.Name" xml:space="preserve">
<value>Image Size</value>
<value>Image size</value>
</data>
<data name="ImageResizer_Configurations.AutomationProperties.Name" xml:space="preserve">
<value>Configurations</value>
@@ -511,19 +511,19 @@
<value>Configuration Name</value>
</data>
<data name="ImageResizer_Fit_Property.AutomationProperties.Name" xml:space="preserve">
<value>Fit Property</value>
<value>Fit property</value>
</data>
<data name="ImageResizer_Width_Property.AutomationProperties.Name" xml:space="preserve">
<value>Width Property</value>
<value>Width property</value>
</data>
<data name="ImageResizer_Height_Property.AutomationProperties.Name" xml:space="preserve">
<value>Height Property</value>
</data>
<data name="ImageResizer_Size_Property.AutomationProperties.Name" xml:space="preserve">
<value>Size Property</value>
<value>Size property</value>
</data>
<data name="ImageResizer_Times_Symbol.AutomationProperties.Name" xml:space="preserve">
<value>Times Symbol</value>
<value>Times symbol</value>
</data>
<data name="RemoveButton.AutomationProperties.Name" xml:space="preserve">
<value>Remove</value>