Skip to content

Commit 50138c7

Browse files
winston-dewinston-de
authored
Moved clear all properties button to bottom of page (#4191)
1 parent 326ebb2 commit 50138c7

File tree

1 file changed

+69
-66
lines changed

1 file changed

+69
-66
lines changed

‎Files/Views/Pages/PropertiesDetails.xaml

Lines changed: 69 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -28,79 +28,82 @@
2828
</ResourceDictionary.MergedDictionaries>
2929
</ResourceDictionary>
3030
</Page.Resources>
31-
<ListView
32-
x:Name="MainList"
33-
ItemsSource="{x:Bind PropertiesSource.View, Mode=OneWay}"
34-
SelectionMode="None">
35-
<ListView.ItemTemplate>
36-
<DataTemplate x:DataType="properties:FileProperty">
37-
<Grid HorizontalAlignment="Stretch">
38-
<Grid.ColumnDefinitions>
39-
<ColumnDefinition Width="*" />
40-
<ColumnDefinition Width="*" />
41-
<ColumnDefinition Width="Auto" />
42-
</Grid.ColumnDefinitions>
31+
<Grid>
32+
<Grid.RowDefinitions>
33+
<RowDefinition />
34+
<RowDefinition Height="Auto"/>
35+
</Grid.RowDefinitions>
36+
<ListView
37+
x:Name="MainList"
38+
ItemsSource="{x:Bind PropertiesSource.View, Mode=OneWay}"
39+
SelectionMode="None">
40+
<ListView.ItemTemplate>
41+
<DataTemplate x:DataType="properties:FileProperty">
42+
<Grid HorizontalAlignment="Stretch">
43+
<Grid.ColumnDefinitions>
44+
<ColumnDefinition Width="*" />
45+
<ColumnDefinition Width="*" />
46+
<ColumnDefinition Width="Auto" />
47+
</Grid.ColumnDefinitions>
4348

44-
<TextBlock
45-
Grid.Row="0"
46-
HorizontalAlignment="Stretch"
47-
Style="{StaticResource PropertyName}"
48-
Text="{x:Bind Name, Mode=OneWay}" />
49-
<TextBox
50-
x:Name="PropertyValueTemplateTextBox"
51-
Grid.Row="0"
52-
Grid.Column="1"
53-
HorizontalAlignment="Stretch"
54-
IsReadOnly="{x:Bind IsReadOnly, Mode=OneWay}"
55-
Style="{StaticResource PropertyValueTextBox}"
56-
Text="{x:Bind ValueText, Mode=TwoWay}" />
57-
</Grid>
58-
</DataTemplate>
59-
</ListView.ItemTemplate>
60-
<ListView.GroupStyle>
61-
<GroupStyle>
62-
<GroupStyle.HeaderTemplate>
63-
<DataTemplate x:DataType="properties:FilePropertySection">
64-
<Border AutomationProperties.Name="{x:Bind Title}">
65-
<TextBlock Style="{ThemeResource SeparatorText}" Text="{x:Bind Title}" />
66-
</Border>
67-
</DataTemplate>
68-
</GroupStyle.HeaderTemplate>
69-
</GroupStyle>
70-
</ListView.GroupStyle>
71-
<ListView.ItemContainerStyle>
72-
<Style TargetType="ListViewItem">
73-
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
74-
</Style>
75-
</ListView.ItemContainerStyle>
76-
<ListView.ItemsPanel>
77-
<ItemsPanelTemplate>
78-
<ItemsStackPanel AreStickyGroupHeadersEnabled="False" />
79-
</ItemsPanelTemplate>
80-
</ListView.ItemsPanel>
81-
82-
<ListView.Footer>
83-
<StackPanel Margin="10,5,10,5" Spacing="5">
84-
<Button
49+
<TextBlock
50+
Grid.Row="0"
51+
HorizontalAlignment="Stretch"
52+
Style="{StaticResource PropertyName}"
53+
Text="{x:Bind Name, Mode=OneWay}" />
54+
<TextBox
55+
x:Name="PropertyValueTemplateTextBox"
56+
Grid.Row="0"
57+
Grid.Column="1"
58+
HorizontalAlignment="Stretch"
59+
IsReadOnly="{x:Bind IsReadOnly, Mode=OneWay}"
60+
Style="{StaticResource PropertyValueTextBox}"
61+
Text="{x:Bind ValueText, Mode=TwoWay}" />
62+
</Grid>
63+
</DataTemplate>
64+
</ListView.ItemTemplate>
65+
<ListView.GroupStyle>
66+
<GroupStyle>
67+
<GroupStyle.HeaderTemplate>
68+
<DataTemplate x:DataType="properties:FilePropertySection">
69+
<Border AutomationProperties.Name="{x:Bind Title}">
70+
<TextBlock Style="{ThemeResource SeparatorText}" Text="{x:Bind Title}" />
71+
</Border>
72+
</DataTemplate>
73+
</GroupStyle.HeaderTemplate>
74+
</GroupStyle>
75+
</ListView.GroupStyle>
76+
<ListView.ItemContainerStyle>
77+
<Style TargetType="ListViewItem">
78+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
79+
</Style>
80+
</ListView.ItemContainerStyle>
81+
<ListView.ItemsPanel>
82+
<ItemsPanelTemplate>
83+
<ItemsStackPanel AreStickyGroupHeadersEnabled="False" />
84+
</ItemsPanelTemplate>
85+
</ListView.ItemsPanel>
86+
</ListView>
87+
<StackPanel Margin="10,5,10,5" Spacing="5" Grid.Row="1">
88+
<Button
8589
x:Name="ClearPropertiesButton"
8690
x:Uid="ClearPropertiesButton"
8791
Margin="0,10,0,0"
8892
HorizontalAlignment="Stretch">
89-
<Button.Flyout>
90-
<Flyout x:Name="ClearPropertiesFlyout">
91-
<StackPanel Orientation="Vertical" Spacing="5">
92-
<TextBlock x:Uid="ClearPropertiesFlyoutText" Text="Confirm?" />
93-
<StackPanel Orientation="Horizontal" Spacing="10">
94-
<Button
93+
<Button.Flyout>
94+
<Flyout x:Name="ClearPropertiesFlyout">
95+
<StackPanel Orientation="Vertical" Spacing="5">
96+
<TextBlock x:Uid="ClearPropertiesFlyoutText" Text="Confirm?" />
97+
<StackPanel Orientation="Horizontal" Spacing="10">
98+
<Button
9599
x:Uid="ClearPropertiesFlyoutConfirmation"
96100
Click="ClearPropertiesConfirmation_Click"
97101
Content="Clear" />
98-
</StackPanel>
99102
</StackPanel>
100-
</Flyout>
101-
</Button.Flyout>
102-
</Button>
103-
</StackPanel>
104-
</ListView.Footer>
105-
</ListView>
103+
</StackPanel>
104+
</Flyout>
105+
</Button.Flyout>
106+
</Button>
107+
</StackPanel>
108+
</Grid>
106109
</local:PropertiesTab>

0 commit comments

Comments
 (0)