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

Merge pull request #11500 from AvaloniaUI/emmauss/managed_dialogs_design_update 

Touch up ManagedFileChooser design a bit
pull/11523/head
Max Katz 3 years ago
committed by GitHub
parent
1c041720d7 7640434aff
commit
9a73ead70e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
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
Unified 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> </DockPanel>
<CheckBox IsChecked="{Binding ShowHiddenFiles}" Content="Show hidden files" DockPanel.Dock="Left"/> <CheckBox IsChecked="{Binding ShowHiddenFiles}" Content="Show hidden files" DockPanel.Dock="Left"/>
<UniformGrid x:Name="Finalize" HorizontalAlignment="Right" Rows="1"> <UniformGrid x:Name="Finalize" HorizontalAlignment="Right" Rows="1">
<Button Command="{Binding Ok}">OK</Button> <Button Command="{Binding Ok}" MinWidth="80">OK</Button>
<Button Command="{Binding Cancel}">Cancel</Button> <Button Command="{Binding Cancel}" MinWidth="80">Cancel</Button>
</UniformGrid> </UniformGrid>
</DockPanel> </DockPanel>
</DockPanel> </DockPanel>
@ -189,7 +189,6 @@
<Grid DockPanel.Dock="Top" Margin="15 5 0 0" HorizontalAlignment="Stretch"> <Grid DockPanel.Dock="Top" Margin="15 5 0 0" HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="20" SharedSizeGroup="Icon" /> <ColumnDefinition Width="20" SharedSizeGroup="Icon" />
<ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
<ColumnDefinition Width="275" SharedSizeGroup="Name" /> <ColumnDefinition Width="275" SharedSizeGroup="Name" />
<ColumnDefinition Width="16" SharedSizeGroup="Splitter" /> <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
<ColumnDefinition Width="200" SharedSizeGroup="Modified" /> <ColumnDefinition Width="200" SharedSizeGroup="Modified" />
@ -197,6 +196,7 @@
<ColumnDefinition Width="150" SharedSizeGroup="Type" /> <ColumnDefinition Width="150" SharedSizeGroup="Type" />
<ColumnDefinition Width="16" SharedSizeGroup="Splitter" /> <ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
<ColumnDefinition Width="200" SharedSizeGroup="Size" /> <ColumnDefinition Width="200" SharedSizeGroup="Size" />
<ColumnDefinition Width="16" SharedSizeGroup="Splitter" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.Styles> <Grid.Styles>
<Style Selector="GridSplitter"> <Style Selector="GridSplitter">
@ -210,14 +210,14 @@
</Setter> </Setter>
</Style> </Style>
</Grid.Styles> </Grid.Styles>
<GridSplitter Grid.Column="1" /> <TextBlock Grid.Column="1" Text="Name" />
<TextBlock Grid.Column="2" Text="Name" /> <GridSplitter Grid.Column="2" />
<GridSplitter Grid.Column="3" /> <TextBlock Grid.Column="3" Text="Date Modified" />
<TextBlock Grid.Column="4" Text="Date Modified" /> <GridSplitter Grid.Column="4" />
<GridSplitter Grid.Column="5" /> <TextBlock Grid.Column="5" Text="Type" />
<TextBlock Grid.Column="6" Text="Type" /> <GridSplitter Grid.Column="6" />
<GridSplitter Grid.Column="7" /> <TextBlock Grid.Column="7" Text="Size" />
<TextBlock Grid.Column="8" Text="Size" /> <GridSplitter Grid.Column="8" />
</Grid> </Grid>
<ListBox x:Name="PART_Files" <ListBox x:Name="PART_Files"
ItemsSource="{Binding Items}" ItemsSource="{Binding Items}"
@ -231,7 +231,6 @@
<Grid Background="Transparent"> <Grid Background="Transparent">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition SharedSizeGroup="Icon" /> <ColumnDefinition SharedSizeGroup="Icon" />
<ColumnDefinition SharedSizeGroup="Splitter" />
<ColumnDefinition SharedSizeGroup="Name" /> <ColumnDefinition SharedSizeGroup="Name" />
<ColumnDefinition SharedSizeGroup="Splitter" /> <ColumnDefinition SharedSizeGroup="Splitter" />
<ColumnDefinition SharedSizeGroup="Modified" /> <ColumnDefinition SharedSizeGroup="Modified" />
@ -239,16 +238,17 @@
<ColumnDefinition SharedSizeGroup="Type" /> <ColumnDefinition SharedSizeGroup="Type" />
<ColumnDefinition SharedSizeGroup="Splitter" /> <ColumnDefinition SharedSizeGroup="Splitter" />
<ColumnDefinition SharedSizeGroup="Size" /> <ColumnDefinition SharedSizeGroup="Size" />
<ColumnDefinition SharedSizeGroup="Splitter" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Image Width="16" Height="16"> <Image Width="16" Height="16">
<Image.Source> <Image.Source>
<DrawingImage Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/> <DrawingImage Drawing="{Binding IconKey, Converter={StaticResource Icons}}"/>
</Image.Source> </Image.Source>
</Image> </Image>
<TextBlock Grid.Column="2" Text="{Binding DisplayName}"/> <TextBlock Grid.Column="1" Text="{Binding DisplayName}"/>
<TextBlock Grid.Column="4" Text="{Binding Modified}" /> <TextBlock Grid.Column="3" Text="{Binding Modified}" />
<TextBlock Grid.Column="6" Text="{Binding Type}" /> <TextBlock Grid.Column="5" Text="{Binding Type}" />
<TextBlock Grid.Column="8"> <TextBlock Grid.Column="7" HorizontalAlignment="Right">
<TextBlock.Text> <TextBlock.Text>
<Binding Path="Size"> <Binding Path="Size">
<Binding.Converter> <Binding.Converter>

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

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

Write Preview
Loading…
Cancel
Save