Skip to content

Commit 6798de2

Browse files
authored
Code Quality: Design polish for the upcoming Shelf feature (#16675)
1 parent 1024760 commit 6798de2

File tree

2 files changed

+28
-12
lines changed

2 files changed

+28
-12
lines changed

src/Files.App/UserControls/Pane/ShelfPane.xaml

+26-10
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,25 @@
1616

1717
<Grid
1818
Width="240"
19-
Padding="12"
2019
AllowDrop="True"
2120
Background="{ThemeResource App.Theme.InfoPane.BackgroundBrush}"
2221
BackgroundSizing="InnerBorderEdge"
2322
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
2423
BorderThickness="1"
2524
CornerRadius="8"
2625
DragOver="Shelf_DragOver"
27-
Drop="Shelf_Drop"
28-
RowSpacing="8">
26+
Drop="Shelf_Drop">
2927

3028
<Grid.RowDefinitions>
3129
<RowDefinition Height="Auto" />
3230
<RowDefinition Height="*" />
3331
<RowDefinition Height="Auto" />
3432
</Grid.RowDefinitions>
3533

36-
<StackPanel Grid.Row="0" Spacing="8">
34+
<StackPanel
35+
Grid.Row="0"
36+
Padding="12,12,12,4"
37+
Spacing="8">
3738

3839
<!-- Title -->
3940
<TextBlock
@@ -50,30 +51,42 @@
5051
<!-- Items List -->
5152
<ListView
5253
Grid.Row="1"
54+
Padding="8,4,8,4"
5355
DragItemsStarting="ListView_DragItemsStarting"
56+
ItemContainerTransitions="{x:Null}"
5457
ItemsSource="{x:Bind ItemsSource, Mode=OneWay}"
5558
ScrollViewer.VerticalScrollBarVisibility="Auto"
5659
ScrollViewer.VerticalScrollMode="Auto"
5760
SelectionMode="Extended">
5861
<ListView.ItemTemplate>
5962
<DataTemplate x:DataType="data:ShelfItem">
60-
<StackPanel Orientation="Horizontal" Spacing="8">
63+
<Grid ColumnSpacing="8">
64+
<Grid.ColumnDefinitions>
65+
<ColumnDefinition Width="Auto" />
66+
<ColumnDefinition Width="*" />
67+
</Grid.ColumnDefinitions>
6168
<Image
69+
Grid.Column="0"
6270
Width="16"
6371
Height="16"
6472
Source="{x:Bind Icon, Mode=OneWay, Converter={StaticResource ImageModelToImageConverter}}" />
65-
<TextBlock Text="{x:Bind Name, Mode=OneWay}" />
73+
<TextBlock
74+
Grid.Column="1"
75+
Text="{x:Bind Name, Mode=OneWay}"
76+
TextTrimming="CharacterEllipsis"
77+
TextWrapping="NoWrap"
78+
ToolTipService.ToolTip="{x:Bind Path, Mode=OneWay}" />
6679

67-
<StackPanel.ContextFlyout>
80+
<Grid.ContextFlyout>
6881
<MenuFlyout>
6982
<MenuFlyoutItem Command="{x:Bind RemoveCommand}" Text="{helpers:ResourceString Name=RemoveFromShelf}">
7083
<MenuFlyoutItem.Icon>
7184
<FontIcon Glyph="&#xE738;" />
7285
</MenuFlyoutItem.Icon>
7386
</MenuFlyoutItem>
7487
</MenuFlyout>
75-
</StackPanel.ContextFlyout>
76-
</StackPanel>
88+
</Grid.ContextFlyout>
89+
</Grid>
7790
</DataTemplate>
7891
</ListView.ItemTemplate>
7992

@@ -86,7 +99,10 @@
8699
</ListView>
87100

88101

89-
<StackPanel Grid.Row="2" Spacing="4">
102+
<StackPanel
103+
Grid.Row="2"
104+
Padding="12,12,12,4"
105+
Spacing="4">
90106

91107
<!-- (Divider) -->
92108
<Border Height="1" Background="{ThemeResource DividerStrokeColorDefaultBrush}" />

src/Files.App/Views/MainPage.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,9 @@
252252
<uc:ShelfPane
253253
x:Name="ShelfPane"
254254
Grid.Row="0"
255-
Grid.RowSpan="2"
255+
Grid.RowSpan="5"
256256
Grid.Column="3"
257-
Margin="4,0,0,0"
257+
Margin="4,0,0,8"
258258
x:Load="{x:Bind ViewModel.ShowShelfPane, Mode=OneWay}" />
259259
</Grid>
260260
</sidebar:SidebarView.InnerContent>

0 commit comments

Comments
 (0)