From 3e874f8bb20e1e0056e3e94b3a82682eb3356ff5 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Sun, 8 Nov 2020 22:08:56 +0100
Subject: [PATCH] Fixed x symbol not showing

---
 .../ui/Properties/Resources.Designer.cs       |  9 +++++++++
 .../imageresizer/ui/Properties/Resources.resx |  3 +++
 .../imageresizer/ui/Views/AdvancedWindow.xaml | 20 +++++++++++++++----
 .../imageresizer/ui/Views/InputPage.xaml      |  9 +++++++--
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/modules/imageresizer/ui/Properties/Resources.Designer.cs b/src/modules/imageresizer/ui/Properties/Resources.Designer.cs
index 2cc6f0bcd2..8ac729b141 100644
--- a/src/modules/imageresizer/ui/Properties/Resources.Designer.cs
+++ b/src/modules/imageresizer/ui/Properties/Resources.Designer.cs
@@ -789,6 +789,15 @@ namespace ImageResizer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Times Symbol.
+        /// </summary>
+        public static string Times_Symbol {
+            get {
+                return ResourceManager.GetString("Times_Symbol", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Unit.
         /// </summary>
diff --git a/src/modules/imageresizer/ui/Properties/Resources.resx b/src/modules/imageresizer/ui/Properties/Resources.resx
index 04740ee39c..5b534e0a31 100644
--- a/src/modules/imageresizer/ui/Properties/Resources.resx
+++ b/src/modules/imageresizer/ui/Properties/Resources.resx
@@ -360,6 +360,9 @@
   <data name="TiffCompressOption_Zip" xml:space="preserve">
     <value>Zip</value>
   </data>
+  <data name="Times_Symbol" xml:space="preserve">
+    <value>Times Symbol</value>
+  </data>
   <data name="Unit" xml:space="preserve">
     <value>Unit</value>
   </data>
diff --git a/src/modules/imageresizer/ui/Views/AdvancedWindow.xaml b/src/modules/imageresizer/ui/Views/AdvancedWindow.xaml
index e6c9de0c99..043a7a72ce 100644
--- a/src/modules/imageresizer/ui/Views/AdvancedWindow.xaml
+++ b/src/modules/imageresizer/ui/Views/AdvancedWindow.xaml
@@ -65,6 +65,7 @@
                                              Text="{Binding Name}"/>
                                     <ComboBox Grid.Column="1"
                                               Margin="8,0,0,0"
+                                              Width="90"
                                               ItemsSource="{Binding Source={StaticResource ResizeFitValues}}"
                                               AutomationProperties.Name="{x:Static p:Resources.Resize_Type}"
                                               SelectedItem="{Binding Fit}">
@@ -91,16 +92,20 @@
                                         </TextBox.Text>
                                     </TextBox>
                                     <TextBlock Grid.Column="3"
-                                               Margin="8,0,0,0"
+                                               Foreground="{DynamicResource PrimaryForegroundBrush}"
+                                               Name="Times_Symbol"
+                                               AutomationProperties.Name="{x:Static p:Resources.Times_Symbol}"
                                                VerticalAlignment="Center"
-                                               Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}">
-                                    </TextBlock>
+                                               Text="&#xE711;"
+                                               FontFamily="Segoe MDL2 Assets"
+                                               Width="25"
+                                               TextAlignment="Center"
+                                               Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}"/>
                                     <TextBox Grid.Column="4"
                                              Width="56"
                                              MaxWidth="56"
                                              TextWrapping="Wrap"
                                              AutomationProperties.Name="{x:Static p:Resources.Height}"
-                                             Margin="8,0,0,0"
                                              Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}">
                                         <TextBox.Text>
                                             <Binding Converter="{StaticResource AutoDoubleConverter}"
@@ -114,6 +119,7 @@
                                     </TextBox>
                                     <ComboBox Grid.Column="5"
                                               Margin="8,0,0,0"
+                                              MinWidth="120"
                                               ItemsSource="{Binding Source={StaticResource ResizeUnitValues}}"
                                               AutomationProperties.Name="{x:Static p:Resources.Unit}"
                                               SelectedItem="{Binding Unit}">
@@ -159,6 +165,7 @@
                            Target="{Binding ElementName=_fallbackEncoderComboBox}"/>
                     <ComboBox Grid.Column="1"
                               HorizontalAlignment="Left"
+                              MinWidth="148"
                               ItemsSource="{Binding Encoders}"
                               AutomationProperties.Name="{x:Static p:Resources.Advanced_FallbackEncoder_Name}"
                               Name="_fallbackEncoderComboBox"
@@ -177,6 +184,7 @@
                     <TextBox Grid.Row="1"
                              Grid.Column="1"
                              Width="56"
+                             MinWidth="148"
                              TextWrapping="Wrap"
                              AutomationProperties.Name="{x:Static p:Resources.Advanced_JpegQualityLevel_Name}"
                              Margin="0,8,0,0"
@@ -191,6 +199,7 @@
                     <ComboBox Grid.Row="2"
                               Grid.Column="1"
                               Margin="0,8,0,0"
+                              MinWidth="148"
                               HorizontalAlignment="Left"
                               AutomationProperties.Name="{x:Static p:Resources.Advanced_PngInterlaceOption_Name}"
                               ItemsSource="{Binding Source={StaticResource PngInterlaceOptionValues}}"
@@ -209,6 +218,7 @@
                            Target="{Binding ElementName=_tiffCompressComboBox}"/>
                     <ComboBox Grid.Row="3"
                               Grid.Column="1"
+                              MinWidth="148"
                               Margin="0,8,0,0"
                               HorizontalAlignment="Left"
                               AutomationProperties.Name="{x:Static p:Resources.Advanced_TiffCompressOption_Name}"
@@ -257,7 +267,9 @@
                                Target="{Binding ElementName=fileNameTextBox}"/>
                         <TextBox Grid.Column="1"
                                  Height="23"
+                                MinWidth="240"
                                  TabIndex="0"
+                                 HorizontalAlignment="Left"
                                  TextWrapping="Wrap"
                                  Name="fileNameTextBox"
                                  AutomationProperties.Name="{x:Static p:Resources.Advanced_FileName_Name}"
diff --git a/src/modules/imageresizer/ui/Views/InputPage.xaml b/src/modules/imageresizer/ui/Views/InputPage.xaml
index 7554a03f5d..5dd0184554 100644
--- a/src/modules/imageresizer/ui/Views/InputPage.xaml
+++ b/src/modules/imageresizer/ui/Views/InputPage.xaml
@@ -111,8 +111,13 @@
                                 </Binding>
                             </TextBox.Text>
                         </TextBox>
-                        <TextBlock Margin="8,0,0,0"
-                                   VerticalAlignment="Center"
+                        <TextBlock VerticalAlignment="Center"
+                                   Text="&#xE711;"
+                                   FontFamily="Segoe MDL2 Assets"
+                                   Width="25"
+                                   Name="Times_Symbol"
+                                   AutomationProperties.Name="{x:Static p:Resources.Times_Symbol}"
+                                   TextAlignment="Center"
                                    Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}"/>
 
                         <TextBox Width="56"