Fixed x symbol not showing

This commit is contained in:
Niels Laute
2020-11-08 22:08:56 +01:00
parent 9ffbc0f08c
commit 3e874f8bb2
4 changed files with 35 additions and 6 deletions

View File

@@ -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> /// <summary>
/// Looks up a localized string similar to Unit. /// Looks up a localized string similar to Unit.
/// </summary> /// </summary>

View File

@@ -360,6 +360,9 @@
<data name="TiffCompressOption_Zip" xml:space="preserve"> <data name="TiffCompressOption_Zip" xml:space="preserve">
<value>Zip</value> <value>Zip</value>
</data> </data>
<data name="Times_Symbol" xml:space="preserve">
<value>Times Symbol</value>
</data>
<data name="Unit" xml:space="preserve"> <data name="Unit" xml:space="preserve">
<value>Unit</value> <value>Unit</value>
</data> </data>

View File

@@ -65,6 +65,7 @@
Text="{Binding Name}"/> Text="{Binding Name}"/>
<ComboBox Grid.Column="1" <ComboBox Grid.Column="1"
Margin="8,0,0,0" Margin="8,0,0,0"
Width="90"
ItemsSource="{Binding Source={StaticResource ResizeFitValues}}" ItemsSource="{Binding Source={StaticResource ResizeFitValues}}"
AutomationProperties.Name="{x:Static p:Resources.Resize_Type}" AutomationProperties.Name="{x:Static p:Resources.Resize_Type}"
SelectedItem="{Binding Fit}"> SelectedItem="{Binding Fit}">
@@ -91,16 +92,20 @@
</TextBox.Text> </TextBox.Text>
</TextBox> </TextBox>
<TextBlock Grid.Column="3" <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" VerticalAlignment="Center"
Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}"> Text="&#xE711;"
</TextBlock> FontFamily="Segoe MDL2 Assets"
Width="25"
TextAlignment="Center"
Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}"/>
<TextBox Grid.Column="4" <TextBox Grid.Column="4"
Width="56" Width="56"
MaxWidth="56" MaxWidth="56"
TextWrapping="Wrap" TextWrapping="Wrap"
AutomationProperties.Name="{x:Static p:Resources.Height}" AutomationProperties.Name="{x:Static p:Resources.Height}"
Margin="8,0,0,0"
Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}"> Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}">
<TextBox.Text> <TextBox.Text>
<Binding Converter="{StaticResource AutoDoubleConverter}" <Binding Converter="{StaticResource AutoDoubleConverter}"
@@ -114,6 +119,7 @@
</TextBox> </TextBox>
<ComboBox Grid.Column="5" <ComboBox Grid.Column="5"
Margin="8,0,0,0" Margin="8,0,0,0"
MinWidth="120"
ItemsSource="{Binding Source={StaticResource ResizeUnitValues}}" ItemsSource="{Binding Source={StaticResource ResizeUnitValues}}"
AutomationProperties.Name="{x:Static p:Resources.Unit}" AutomationProperties.Name="{x:Static p:Resources.Unit}"
SelectedItem="{Binding Unit}"> SelectedItem="{Binding Unit}">
@@ -159,6 +165,7 @@
Target="{Binding ElementName=_fallbackEncoderComboBox}"/> Target="{Binding ElementName=_fallbackEncoderComboBox}"/>
<ComboBox Grid.Column="1" <ComboBox Grid.Column="1"
HorizontalAlignment="Left" HorizontalAlignment="Left"
MinWidth="148"
ItemsSource="{Binding Encoders}" ItemsSource="{Binding Encoders}"
AutomationProperties.Name="{x:Static p:Resources.Advanced_FallbackEncoder_Name}" AutomationProperties.Name="{x:Static p:Resources.Advanced_FallbackEncoder_Name}"
Name="_fallbackEncoderComboBox" Name="_fallbackEncoderComboBox"
@@ -177,6 +184,7 @@
<TextBox Grid.Row="1" <TextBox Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Width="56" Width="56"
MinWidth="148"
TextWrapping="Wrap" TextWrapping="Wrap"
AutomationProperties.Name="{x:Static p:Resources.Advanced_JpegQualityLevel_Name}" AutomationProperties.Name="{x:Static p:Resources.Advanced_JpegQualityLevel_Name}"
Margin="0,8,0,0" Margin="0,8,0,0"
@@ -191,6 +199,7 @@
<ComboBox Grid.Row="2" <ComboBox Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Margin="0,8,0,0" Margin="0,8,0,0"
MinWidth="148"
HorizontalAlignment="Left" HorizontalAlignment="Left"
AutomationProperties.Name="{x:Static p:Resources.Advanced_PngInterlaceOption_Name}" AutomationProperties.Name="{x:Static p:Resources.Advanced_PngInterlaceOption_Name}"
ItemsSource="{Binding Source={StaticResource PngInterlaceOptionValues}}" ItemsSource="{Binding Source={StaticResource PngInterlaceOptionValues}}"
@@ -209,6 +218,7 @@
Target="{Binding ElementName=_tiffCompressComboBox}"/> Target="{Binding ElementName=_tiffCompressComboBox}"/>
<ComboBox Grid.Row="3" <ComboBox Grid.Row="3"
Grid.Column="1" Grid.Column="1"
MinWidth="148"
Margin="0,8,0,0" Margin="0,8,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
AutomationProperties.Name="{x:Static p:Resources.Advanced_TiffCompressOption_Name}" AutomationProperties.Name="{x:Static p:Resources.Advanced_TiffCompressOption_Name}"
@@ -257,7 +267,9 @@
Target="{Binding ElementName=fileNameTextBox}"/> Target="{Binding ElementName=fileNameTextBox}"/>
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
Height="23" Height="23"
MinWidth="240"
TabIndex="0" TabIndex="0"
HorizontalAlignment="Left"
TextWrapping="Wrap" TextWrapping="Wrap"
Name="fileNameTextBox" Name="fileNameTextBox"
AutomationProperties.Name="{x:Static p:Resources.Advanced_FileName_Name}" AutomationProperties.Name="{x:Static p:Resources.Advanced_FileName_Name}"

View File

@@ -111,8 +111,13 @@
</Binding> </Binding>
</TextBox.Text> </TextBox.Text>
</TextBox> </TextBox>
<TextBlock Margin="8,0,0,0" <TextBlock VerticalAlignment="Center"
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}}"/> Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}"/>
<TextBox Width="56" <TextBox Width="56"