From 773c57e6094ef995875faeccb569fe09ad304218 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 23 Oct 2020 16:10:16 +0200
Subject: [PATCH] File format limitations are now announced by Narrator

---
 .../Views/ImageResizerPage.xaml               | 70 ++++++++-----------
 1 file changed, 31 insertions(+), 39 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
index 3939cea8ec..d7c98c4f64 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -255,7 +255,9 @@
                       MinWidth="240"
                       IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
                       Margin="{StaticResource SmallTopMargin}"
-                      AutomationProperties.LabeledBy="{Binding ElementName=ImageResizer_FilenameFormatHeader}">
+                      AutomationProperties.LabeledBy="{Binding ElementName=ImageResizer_FilenameFormatHeader}"
+                      AutomationProperties.HelpText="{Binding ElementName=FileFormatTextBlock, Path=Text}"
+                     >
                 <TextBox.Header>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Name="ImageResizer_FilenameFormatHeader"
@@ -268,44 +270,34 @@
                     </StackPanel>
                 </TextBox.Header>
                 <ToolTipService.ToolTip>
-                    <StackPanel>
-                        <TextBlock x:Uid="ImageResizer_FileFormatDescription"/>
-                        <TextBlock Margin="{StaticResource SmallTopMargin}">
-                            <Run Text="%1" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_Filename" />
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%2" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_Sizename"/>
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%3" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_SelectedWidth"/>
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%4" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_SelectedHeight"/>
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%5" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_ActualWidth"/>
-                        </TextBlock>
-
-                        <TextBlock>
-                            <Run Text="%6" FontWeight="Bold" />
-                            <Run Text=" - "/>
-                            <Run x:Uid="ImageResizer_Formatting_ActualHeight"/>
-                        </TextBlock>
-                    </StackPanel>
+                    <TextBlock x:Name="FileFormatTextBlock">
+                        <Run x:Uid="ImageResizer_FileFormatDescription"/>
+                        <LineBreak/>
+                        <LineBreak/>
+                        <Run Text="%1" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_Filename" />
+                        <LineBreak/>
+                        <Run Text="%2" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_Sizename"/>
+                        <LineBreak/>
+                        <Run Text="%3" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_SelectedWidth"/>
+                        <LineBreak/>
+                        <Run Text="%4" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_SelectedHeight"/>
+                        <LineBreak/>
+                        <Run Text="%5" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_ActualWidth"/>
+                        <LineBreak/>
+                        <Run Text="%6" FontWeight="Bold" />
+                        <Run Text=" - "/>
+                        <Run x:Uid="ImageResizer_Formatting_ActualHeight"/>
+                    </TextBlock>
                 </ToolTipService.ToolTip>
             </TextBox>