Skip to content

Commit c08fa1b

Browse files
authored
Added chevrons to folder in column view (#9549)
1 parent 7423c17 commit c08fa1b

File tree

2 files changed

+24
-13
lines changed

2 files changed

+24
-13
lines changed

src/Files.Uwp/Filesystem/ListedItem.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@ public override string ToString()
400400
return $"{ItemName}, {suffix}";
401401
}
402402

403+
public bool IsFolder => PrimaryItemAttribute is StorageItemTypes.Folder;
403404
public bool IsRecycleBinItem => this is RecycleBinItem;
404405
public bool IsShortcutItem => this is ShortcutItem;
405406
public bool IsLibraryItem => this is LibraryItem;

src/Files.Uwp/Views/LayoutModes/ColumnViewBase.xaml

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<local:BaseLayout
22
x:Class="Files.Uwp.Views.LayoutModes.ColumnViewBase"
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:local="using:Files.Uwp"
8-
xmlns:converters1="using:Files.Uwp.Converters"
9-
xmlns:local2="using:Files.Uwp.Filesystem"
10-
xmlns:local3="using:Files.Uwp.Filesystem.Cloud"
11-
xmlns:helpers="using:Files.Uwp.Helpers"
12-
xmlns:uc="using:Files.Uwp.UserControls"
13-
xmlns:vc="using:Files.Uwp.ValueConverters"
14-
xmlns:tui="using:Microsoft.Toolkit.Uwp.UI"
155
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
166
xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
177
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
188
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
19-
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
20-
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
9+
xmlns:converters1="using:Files.Uwp.Converters"
10+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
11+
xmlns:helpers="using:Files.Uwp.Helpers"
2112
xmlns:i="using:Microsoft.Xaml.Interactivity"
13+
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
14+
xmlns:local="using:Files.Uwp"
15+
xmlns:local2="using:Files.Uwp.Filesystem"
16+
xmlns:local3="using:Files.Uwp.Filesystem.Cloud"
17+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
18+
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
19+
xmlns:tui="using:Microsoft.Toolkit.Uwp.UI"
20+
xmlns:uc="using:Files.Uwp.UserControls"
21+
xmlns:vc="using:Files.Uwp.ValueConverters"
2222
x:Name="PageRoot"
2323
mc:Ignorable="d">
2424
<local:BaseLayout.Resources>
@@ -187,7 +187,7 @@
187187
<Grid
188188
Height="30"
189189
Margin="0"
190-
Padding="8,0"
190+
Padding="8,0,0,0"
191191
HorizontalAlignment="Stretch"
192192
VerticalAlignment="Stretch"
193193
Background="Transparent"
@@ -200,6 +200,7 @@
200200
<ColumnDefinition Width="24" />
201201
<ColumnDefinition Width="*" />
202202
<ColumnDefinition Width="Auto" />
203+
<ColumnDefinition Width="20" />
203204
</Grid.ColumnDefinitions>
204205
<animations:Explicit.Animations>
205206
<animations:AnimationSet x:Name="FadeAnimation">
@@ -332,6 +333,15 @@
332333
Visibility="{x:Bind FileTagsUI, Converter={StaticResource EmptyObjectToObjectConverter}, Mode=OneWay}" />
333334
</StackPanel>
334335
</Grid>
336+
<FontIcon
337+
x:Name="OpenFolderChevron"
338+
Grid.Column="3"
339+
HorizontalAlignment="Right"
340+
VerticalAlignment="Center"
341+
FontSize="12"
342+
Foreground="{ThemeResource TextFillColorSecondary}"
343+
Glyph="&#xE76C;"
344+
x:Load="{x:Bind IsFolder}" />
335345
</Grid>
336346
</DataTemplate>
337347
</ListView.ItemTemplate>

0 commit comments

Comments
 (0)