tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Touch up ManagedFileChooser design a bit

pull/11500/head
Emmanuel Hansen 3 years ago
parent
89be3ee533
commit
2f48e5b79b
2 changed files with 58 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
  2. 59
      src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml

32
src/Avalonia.Themes.Fluent/Controls/ManagedFileChooser.xaml
View File

@ -179,8 +179,8 @@
</DockPanel>
<CheckBox IsChecked="{Binding ShowHiddenFiles}" Content="Show hidden files" DockPanel.Dock="Left"/>
<UniformGrid x:Name="Finalize" HorizontalAlignment="Right" Rows="1">
<Button Command="{Binding Ok}">OK</Button>
<Button Command="{Binding Cancel}">Cancel</Button>
<Button Command="{Binding Ok}" Width="80">OK</Button>
<Button Command="{Binding Cancel}" Width="80">Cancel</Button>
</UniformGrid>
</DockPanel>
</DockPanel>
@ -189,7 +189,6 @@
<Grid DockPanel.Dock="Top" Margin="15 5 0 0" HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="20" SharedSizeGroup="Icon" />
<ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
<ColumnDefinition Width="275" SharedSizeGroup="Name" />
<ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
<ColumnDefinition Width="200" SharedSizeGroup="Modified" />
@ -197,6 +196,7 @@
<ColumnDefinition Width="150" SharedSizeGroup="Type" />
<ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
<ColumnDefinition Width="200" SharedSizeGroup="Size" />
<ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
</Grid.ColumnDefinitions>
<Grid.Styles>
<Style Selector="GridSplitter">
@ -210,14 +210,14 @@
</Setter>
</Style>
</Grid.Styles>
<GridSplitter Grid.Column="1" />
<TextBlock Grid.Column="2" Text="Name" />
<GridSplitter Grid.Column="3" />
<TextBlock Grid.Column="4" Text="Date Modified" />
<GridSplitter Grid.Column="5" />
<TextBlock Grid.Column="6" Text="Type" />
<GridSplitter Grid.Column="7" />
<TextBlock Grid.Column="8" Text="Size" />
<TextBlock Grid.Column="1" Text="Name" />
<GridSplitter Grid.Column="2" />
<TextBlock Grid.Column="3" Text="Date Modified" />
<GridSplitter Grid.Column="4" />
<TextBlock Grid.Column="5" Text="Type" />
<GridSplitter Grid.Column="6" />
<TextBlock Grid.Column="7" Text="Size" />
<GridSplitter Grid.Column="8" />
</Grid>
<ListBox x:Name="PART_Files"
ItemsSource="{Binding Items}"
@ -231,7 +231,6 @@
<Grid Background="Transparent">
<Grid.ColumnDefinitions>
<ColumnDefinition SharedSizeGroup="Icon" />
<ColumnDefinition SharedSizeGroup="Splitter" />
<ColumnDefinition SharedSizeGroup="Name" />
<ColumnDefinition SharedSizeGroup="Splitter" />
<ColumnDefinition SharedSizeGroup="Modified" />
@ -239,16 +238,17 @@
<ColumnDefinition SharedSizeGroup="Type" />
<ColumnDefinition SharedSizeGroup="Splitter" />
<ColumnDefinition SharedSizeGroup="Size" />
<ColumnDefinition SharedSizeGroup="Splitter" />
</Grid.ColumnDefinitions>
<Image Width="16" Height="16">
<Image.Source>
<DrawingImage Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
</Image.Source>
</Image>
<TextBlock Grid.Column="2" Text="{Binding DisplayName}"/>
<TextBlock Grid.Column="4" Text="{Binding Modified}" />
<TextBlock Grid.Column="6" Text="{Binding Type}" />
<TextBlock Grid.Column="8">
<TextBlock Grid.Column="1" Text="{Binding DisplayName}"/>
<TextBlock Grid.Column="3" Text="{Binding Modified}" />
<TextBlock Grid.Column="5" Text="{Binding Type}" />
<TextBlock Grid.Column="7" HorizontalAlignment="Right">
<TextBlock.Text>
<Binding Path="Size">
<Binding.Converter>

59
src/Avalonia.Themes.Simple/Controls/ManagedFileChooser.xaml
View File

@ -49,7 +49,7 @@
TargetType="dialogs:ManagedFileChooser">
<Setter Property="Template">
<ControlTemplate x:DataType="internal:ManagedFileChooserViewModel">
<DockPanel>
<DockPanel Margin="5">
<DockPanel Margin="0,0,0,5"
DockPanel.Dock="Top">
<internal:ChildFitter Width="{Binding ElementName=Location, Path=Bounds.Height}"
@ -93,8 +93,8 @@
<Setter Property="Margin" Value="4" />
</Style>
</StackPanel.Styles>
<Button Command="{Binding Ok}">OK</Button>
<Button Command="{Binding Cancel}">Cancel</Button>
<Button Command="{Binding Ok}" Width="60">OK</Button>
<Button Command="{Binding Cancel}" Width="60">Cancel</Button>
</StackPanel>
</DockPanel>
@ -136,7 +136,6 @@
DockPanel.Dock="Top">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="20" SharedSizeGroup="Icon" />
<ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
<ColumnDefinition Width="400" SharedSizeGroup="Name" />
<ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
<ColumnDefinition Width="200" SharedSizeGroup="Modified" />
@ -144,19 +143,45 @@
<ColumnDefinition Width="150" SharedSizeGroup="Type" />
<ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
<ColumnDefinition Width="200" SharedSizeGroup="Size" />
<ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
</Grid.ColumnDefinitions>
<GridSplitter Grid.Column="1" />
<TextBlock Grid.Column="2"
<TextBlock Grid.Column="1"
Text="Name" />
<GridSplitter Grid.Column="3" />
<TextBlock Grid.Column="4"
<GridSplitter Grid.Column="2"
ResizeDirection="Columns"
Background="Transparent" />
<Rectangle HorizontalAlignment="Left" Grid.Column="2" VerticalAlignment="Stretch" Width="1" Fill="{DynamicResource ThemeControlMidBrush}"/>
<TextBlock Grid.Column="3"
Text="Date Modified" />
<GridSplitter Grid.Column="5" />
<TextBlock Grid.Column="6"
<GridSplitter Grid.Column="4"
ResizeDirection="Columns"
Background="Transparent" />
<Rectangle HorizontalAlignment="Left"
Grid.Column="4"
VerticalAlignment="Stretch"
Width="1"
Fill="{DynamicResource ThemeControlMidBrush}"/>
<TextBlock Grid.Column="5"
Text="Type" />
<GridSplitter Grid.Column="7" />
<TextBlock Grid.Column="8"
<GridSplitter Grid.Column="6" ResizeDirection="Columns"
Background="Transparent" />
<Rectangle HorizontalAlignment="Left"
Grid.Column="6"
VerticalAlignment="Stretch"
Width="1"
Fill="{DynamicResource ThemeControlMidBrush}"/>
<TextBlock Grid.Column="7"
Text="Size" />
<GridSplitter Grid.Column="8"
ResizeDirection="Columns"
Background="Transparent" />
<Rectangle HorizontalAlignment="Left"
Grid.Column="8"
VerticalAlignment="Stretch"
Width="1"
Fill="{DynamicResource ThemeControlMidBrush}"/>
</Grid>
<ListBox x:Name="PART_Files"
Margin="0,5"
@ -169,7 +194,6 @@
<Grid Background="Transparent">
<Grid.ColumnDefinitions>
<ColumnDefinition SharedSizeGroup="Icon" />
<ColumnDefinition SharedSizeGroup="Splitter" />
<ColumnDefinition SharedSizeGroup="Name" />
<ColumnDefinition SharedSizeGroup="Splitter" />
<ColumnDefinition SharedSizeGroup="Modified" />
@ -177,19 +201,20 @@
<ColumnDefinition SharedSizeGroup="Type" />
<ColumnDefinition SharedSizeGroup="Splitter" />
<ColumnDefinition SharedSizeGroup="Size" />
<ColumnDefinition SharedSizeGroup="Splitter" />
</Grid.ColumnDefinitions>
<Image Grid.Column="0"
Width="16"
Height="16">
<DrawingImage Drawing="{Binding IconKey, Converter={StaticResource Icons}}" />
</Image>
<TextBlock Grid.Column="2"
<TextBlock Grid.Column="1"
Text="{Binding DisplayName}" />
<TextBlock Grid.Column="4"
<TextBlock Grid.Column="3"
Text="{Binding Modified}" />
<TextBlock Grid.Column="6"
<TextBlock Grid.Column="5"
Text="{Binding Type}" />
<TextBlock Grid.Column="8">
<TextBlock Grid.Column="7" HorizontalAlignment="Right">
<TextBlock.Text>
<Binding Path="Size">
<Binding.Converter>

Write Preview
Loading…
Cancel
Save