mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 09:28:03 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixed visual inconsistency for the image resizer sizes listview

Browse Source
This commit is contained in:
Niels Laute 2020-05-05 22:47:59 +02:00
parent b0bc57466e
commit e66e5e6f6e
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
View File

@ -50,8 +50,7 @@
<TextBlock x:Uid="ImageResizer_Description" <TextBlock x:Uid="ImageResizer_Description"
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
<ToggleSwitch x:Uid="ImageResizer_EnableToggle" IsOn="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}" <ToggleSwitch x:Uid="ImageResizer_EnableToggle" IsOn="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"/>
Margin="{StaticResource SmallTopMargin}" />
<TextBlock x:Uid="ImageResizer_CustomSizes" <TextBlock x:Uid="ImageResizer_CustomSizes"
Style="{StaticResource SettingsGroupTitleStyle}"/> Style="{StaticResource SettingsGroupTitleStyle}"/>
@ -60,8 +59,10 @@
<ListView x:Name="ImagesSizesListView" <ListView x:Name="ImagesSizesListView"
ItemsSource="{Binding Sizes, Mode=TwoWay, Source={StaticResource ViewModel}}" ItemsSource="{Binding Sizes, Mode=TwoWay, Source={StaticResource ViewModel}}"
Padding="0" Padding="0"
IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled, Source={StaticResource ViewModel}}"
Margin="0"> Margin="0"
SelectionMode="None"
>
<ListView.ItemContainerStyle> <ListView.ItemContainerStyle>
<Style TargetType="ListViewItem"> <Style TargetType="ListViewItem">
@ -95,15 +96,17 @@
</ListView.ItemContainerStyle> </ListView.ItemContainerStyle>
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate x:Name="SingleLineDataTemplate" x:DataType="models:ImageSize" > <DataTemplate x:Name="SingleLineDataTemplate" x:DataType="models:ImageSize" >
<StackPanel Orientation="Horizontal" Padding="0" Spacing="4"> <StackPanel Orientation="Horizontal" Height="48" Padding="0" Spacing="4">
<TextBox Text="{x:Bind Path=Name, Mode=TwoWay}" <TextBox Text="{x:Bind Path=Name, Mode=TwoWay}"
Width="90" Width="90"
Height="35" VerticalAlignment="Center"
Height="34"
Margin="{StaticResource SmallTopMargin}"/> Margin="{StaticResource SmallTopMargin}"/>
<ComboBox SelectedIndex="{x:Bind Path=Fit, Mode=TwoWay}" <ComboBox SelectedIndex="{x:Bind Path=Fit, Mode=TwoWay}"
Width="90" Width="90"
Height="35" VerticalAlignment="Center"
Height="34"
Margin="{StaticResource SmallTopMargin}"> Margin="{StaticResource SmallTopMargin}">
<ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Fill" /> <ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Fill" />
<ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Fit" /> <ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Fit" />
@ -113,37 +116,42 @@
<muxc:NumberBox Value="{x:Bind Path=Width, Mode=TwoWay}" <muxc:NumberBox Value="{x:Bind Path=Width, Mode=TwoWay}"
Width="68" Width="68"
Height="34" Height="34"
VerticalAlignment="Center"
Margin="{StaticResource SmallTopMargin}"/> Margin="{StaticResource SmallTopMargin}"/>
<TextBlock Text="x" <TextBlock Text="&#xE711;"
FontWeight="SemiBold" FontFamily="Segoe MDL2 Assets"
TextAlignment="Center" TextAlignment="Center"
VerticalAlignment="Center"
Margin="{StaticResource SmallTopMargin}" Margin="{StaticResource SmallTopMargin}"
Width="25" Width="25"/>
Height="35"/>
<muxc:NumberBox Value="{x:Bind Path=Height, Mode=TwoWay}" <muxc:NumberBox Value="{x:Bind Path=Height, Mode=TwoWay}"
Width="68" Width="68"
Height="34" Height="34"
VerticalAlignment="Center"
Margin="{StaticResource SmallTopMargin}"/> Margin="{StaticResource SmallTopMargin}"/>
<ComboBox SelectedIndex="{Binding Path=Unit, Mode=TwoWay}" <ComboBox SelectedIndex="{Binding Path=Unit, Mode=TwoWay}"
Width="90" Width="90"
Height="35" Height="34"
VerticalAlignment="Center"
Margin="{StaticResource SmallTopMargin}"> Margin="{StaticResource SmallTopMargin}">
<ComboBoxItem x:Uid="ImageResizer_Sizes_Units_CM" /> <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_CM" />
<ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Inches" /> <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Inches" />
<ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Percent" /> <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Percent" />
<ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Pixels" /> <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Pixels" />
</ComboBox> </ComboBox>
<AppBarButton x:Name="RemoveButton" <Button x:Name="RemoveButton"
Background="Transparent" Background="Transparent"
Command = "{Binding DeleteImageSizeEventHandler, Source={StaticResource ViewModel}}" Command = "{Binding DeleteImageSizeEventHandler, Source={StaticResource ViewModel}}"
CommandParameter="{Binding Id}" CommandParameter="{Binding Id}"
Icon="Delete" FontFamily="Segoe MDL2 Assets"
Width="52" Height="34"
Height="32" Width="34"
Margin="{StaticResource SmallTopMargin}" Padding="0,0,50,100" UseLayoutRounding="False"/> Content="&#xE74D;"
VerticalAlignment="Center"
Margin="{StaticResource SmallTopMargin}" UseLayoutRounding="False"/>
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>