Skip to content

Commit c554fe1

Browse files
authored
Auto select first item in user list for permissions (#8794)
1 parent 006d537 commit c554fe1

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

src/Files.Uwp/Views/Pages/PropertiesSecurity.xaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<local:PropertiesTab
22
x:Class="Files.Views.PropertiesSecurity"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
54
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:perm="using:Files.Filesystem.Permissions"
5+
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
6+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
87
xmlns:helpers="using:Files.Helpers"
98
xmlns:local="using:Files.ViewModels.Properties"
10-
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
9+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
10+
xmlns:perm="using:Files.Filesystem.Permissions"
1111
d:Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
1212
Loaded="Properties_Loaded"
1313
mc:Ignorable="d">
@@ -92,12 +92,13 @@
9292
HorizontalAlignment="Stretch"
9393
x:Load="{x:Bind SecurityProperties.FilePermissions.CanReadFilePermissions, Mode=OneWay}"
9494
ItemsSource="{x:Bind SecurityProperties.FilePermissions.RulesForUsers, Mode=OneWay}"
95+
SelectedIndex="0"
9596
SelectedItem="{x:Bind SecurityProperties.SelectedRuleForUser, Mode=TwoWay}"
9697
SelectionMode="Single">
9798
<ListView.ItemContainerStyle>
9899
<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
99-
<Setter Property="MinHeight" Value="40" />
100-
<Setter Property="Height" Value="40" />
100+
<Setter Property="MinHeight" Value="1" />
101+
<Setter Property="Height" Value="{ThemeResource ListItemHeight}" />
101102
</Style>
102103
</ListView.ItemContainerStyle>
103104
<ListView.ItemTemplate>

src/Files.Uwp/Views/Pages/PropertiesSecurityAdvanced.xaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Page
22
x:Class="Files.Views.PropertiesSecurityAdvanced"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
54
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:perm="using:Files.Filesystem.Permissions"
8-
xmlns:helpers="using:Files.Helpers"
95
xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
106
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
11-
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
7+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
8+
xmlns:helpers="using:Files.Helpers"
129
xmlns:i="using:Microsoft.Xaml.Interactivity"
10+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
11+
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
12+
xmlns:perm="using:Files.Filesystem.Permissions"
1313
d:Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
1414
d:Height="550"
1515
d:Width="850"
@@ -186,8 +186,8 @@
186186
</i:Interaction.Behaviors>
187187
<ListView.ItemContainerStyle>
188188
<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
189-
<Setter Property="MinHeight" Value="40" />
190-
<Setter Property="Height" Value="40" />
189+
<Setter Property="MinHeight" Value="1" />
190+
<Setter Property="Height" Value="{ThemeResource ListItemHeight}" />
191191
</Style>
192192
</ListView.ItemContainerStyle>
193193
<ListView.Header>
@@ -477,9 +477,7 @@
477477
Command="{x:Bind ViewModel.ReplaceChildPermissionsCommand}"
478478
ToolTipService.ToolTip="{helpers:ResourceString Name=SecurityAdvancedReplaceChildPermissions2/ToolTipService/ToolTip}"
479479
Visibility="Collapsed">
480-
<TextBlock
481-
Text="{helpers:ResourceString Name=SecurityAdvancedReplaceChildPermissions/Text}"
482-
TextTrimming="CharacterEllipsis" />
480+
<TextBlock Text="{helpers:ResourceString Name=SecurityAdvancedReplaceChildPermissions/Text}" TextTrimming="CharacterEllipsis" />
483481
</Button>
484482
</Grid>
485483
</Grid>

0 commit comments

Comments
 (0)