Skip to content

Commit 2e5cd2a

Browse files
committed
Update AddressToolbar.xaml
1 parent 3145ba7 commit 2e5cd2a

File tree

5 files changed

+66
-30
lines changed

5 files changed

+66
-30
lines changed

src/Files.App/UserControls/AddressToolbar.xaml

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,53 @@
582582
</VisualState.Setters>
583583
</VisualState>
584584
</VisualStateGroup>
585+
<VisualStateGroup>
586+
<VisualState x:Name="TasksSuccess">
587+
<VisualState.StateTriggers>
588+
<triggers:CompareStateTrigger
589+
Comparison="Equal"
590+
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
591+
To="0" />
592+
</VisualState.StateTriggers>
593+
<VisualState.Setters>
594+
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource SuccessIconInfoBadgeStyle}" />
595+
</VisualState.Setters>
596+
</VisualState>
597+
<VisualState x:Name="TasksOnging">
598+
<VisualState.StateTriggers>
599+
<triggers:CompareStateTrigger
600+
Comparison="Equal"
601+
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
602+
To="1" />
603+
</VisualState.StateTriggers>
604+
<VisualState.Setters>
605+
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource AttentionValueInfoBadgeStyle}" />
606+
</VisualState.Setters>
607+
</VisualState>
608+
<VisualState x:Name="TasksFailure">
609+
<VisualState.StateTriggers>
610+
<triggers:CompareStateTrigger
611+
Comparison="Equal"
612+
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
613+
To="2" />
614+
</VisualState.StateTriggers>
615+
<VisualState.Setters>
616+
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource CriticalValueInfoBadgeStyle}" />
617+
</VisualState.Setters>
618+
</VisualState>
619+
<VisualState x:Name="TasksCompletionWithFailure">
620+
<VisualState.StateTriggers>
621+
<triggers:CompareStateTrigger
622+
Comparison="Equal"
623+
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
624+
To="3" />
625+
</VisualState.StateTriggers>
626+
<VisualState.Setters>
627+
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource CriticalIconInfoBadgeStyle}" />
628+
</VisualState.Setters>
629+
</VisualState>
630+
</VisualStateGroup>
585631
</VisualStateManager.VisualStateGroups>
586632
</Grid>
587633

588-
</UserControl>
634+
</UserControl>

src/Files.App/UserControls/Widgets/DrivesWidget.xaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1010
mc:Ignorable="d">
1111

12-
<Grid Padding="16,0,16,0">
12+
<Grid>
1313
<ItemsRepeater
1414
x:Name="CardsList"
1515
HorizontalAlignment="Stretch"
@@ -57,7 +57,6 @@
5757
<RowDefinition Height="*" />
5858
<RowDefinition Height="*" />
5959
</Grid.RowDefinitions>
60-
6160
<Image
6261
Grid.RowSpan="3"
6362
Grid.Column="0"
@@ -127,7 +126,6 @@
127126
TextTrimming="CharacterEllipsis"
128127
TextWrapping="NoWrap"
129128
ToolTipService.ToolTip="{x:Bind Item.SpaceText, Mode=OneWay}" />
130-
131129
</Grid>
132130
</Button>
133131
</DataTemplate>

src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d">
1010

11-
<Grid Padding="16,0,16,0">
11+
<Grid>
1212
<ItemsRepeater
1313
x:Name="CardsList"
1414
Grid.Row="0"

src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212
Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
1313
mc:Ignorable="d">
1414

15-
<StackPanel x:Name="RecentsListGrid" Padding="12,0,12,0">
15+
<StackPanel x:Name="RecentsListGrid" Orientation="Vertical">
1616

1717
<!-- Message when recent files are disabled in File Explorer -->
1818
<muxc:InfoBar
1919
x:Name="RecentFilesDisabledOnWindowsWarning"
20-
Margin="4,0,4,0"
2120
x:Load="{x:Bind IsRecentFilesDisabledInWindows, Mode=OneWay}"
2221
IsClosable="False"
2322
IsIconVisible="True"
@@ -28,7 +27,6 @@
2827
<!-- Message when there are no recent files to display -->
2928
<TextBlock
3029
x:Name="RecentItemDescription"
31-
Margin="4,0,4,0"
3230
HorizontalAlignment="Stretch"
3331
x:Load="{x:Bind IsEmptyRecentsTextVisible, Mode=OneWay}"
3432
FontSize="14"
@@ -51,8 +49,6 @@
5149

5250
<ListView.ItemContainerStyle>
5351
<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
54-
<Setter Property="Margin" Value="0" />
55-
<Setter Property="Padding" Value="12,0" />
5652
<Setter Property="MinHeight" Value="1" />
5753
<Setter Property="Height" Value="{ThemeResource ListItemHeight}" />
5854
<Setter Property="Margin" Value="{ThemeResource ListItemMargin}" />
@@ -62,41 +58,41 @@
6258
<ListView.ItemTemplate>
6359
<DataTemplate x:DataType="recent:RecentItem">
6460
<Grid
61+
Padding="2.5"
62+
HorizontalAlignment="Stretch"
63+
VerticalAlignment="Stretch"
6564
AutomationProperties.Name="{x:Bind Name}"
66-
ColumnSpacing="20"
65+
ColumnSpacing="14"
6766
ToolTipService.ToolTip="{x:Bind RecentPath}">
6867
<Grid.ColumnDefinitions>
6968
<ColumnDefinition Width="Auto" />
7069
<ColumnDefinition Width="*" />
71-
<ColumnDefinition Width="1.5*" />
70+
<ColumnDefinition Width="*" />
7271
</Grid.ColumnDefinitions>
73-
7472
<FontIcon
7573
x:Name="RecentFolderImg"
7674
Grid.Column="0"
7775
HorizontalAlignment="Center"
7876
VerticalAlignment="Center"
7977
x:Load="{x:Bind FolderImg}"
8078
x:Phase="1"
81-
FontSize="20"
79+
FontSize="24"
8280
Foreground="#ffe793"
8381
Glyph="&#xE8B7;" />
84-
8582
<FontIcon
8683
x:Name="EmptyImg"
8784
Grid.Column="0"
8885
HorizontalAlignment="Center"
8986
VerticalAlignment="Center"
9087
x:Load="{x:Bind EmptyImgVis}"
9188
x:Phase="1"
92-
FontSize="20"
89+
FontSize="24"
9390
Glyph="&#xE7C3;" />
94-
9591
<Image
9692
x:Name="RecentFileImg"
9793
Grid.Column="0"
98-
Width="20"
99-
Height="20"
94+
Width="24"
95+
Height="24"
10096
HorizontalAlignment="Center"
10197
VerticalAlignment="Center"
10298
x:Load="{x:Bind FileIconVis}"
@@ -118,12 +114,11 @@
118114
Text="{x:Bind RecentPath}"
119115
TextTrimming="CharacterEllipsis"
120116
TextWrapping="NoWrap" />
121-
122117
</Grid>
123118
</DataTemplate>
124119
</ListView.ItemTemplate>
125120

126121
</ListView>
127122

128123
</StackPanel>
129-
</local:HomePageWidget>
124+
</local:HomePageWidget>

src/Files.App/UserControls/Widgets/WidgetsListControl.xaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -412,16 +412,13 @@
412412
</UserControl.Resources>
413413

414414
<Border>
415-
<ListView
416-
Padding="0,0,0,16"
417-
ItemsSource="{x:Bind ViewModel.Widgets, Mode=OneWay}"
418-
SelectionMode="None">
415+
<ListView ItemsSource="{x:Bind ViewModel.Widgets, Mode=OneWay}" SelectionMode="None">
419416

420417
<!-- Remove Reveal Highlight Effect -->
421418
<ListView.ItemContainerStyle>
422419
<Style TargetType="ListViewItem">
423420
<!-- Spacing -->
424-
<Setter Property="Margin" Value="0" />
421+
<Setter Property="Margin" Value="4" />
425422
<Setter Property="Template">
426423
<Setter.Value>
427424
<ControlTemplate TargetType="ListViewItem">
@@ -437,9 +434,9 @@
437434

438435
<ListView.ItemTemplate>
439436
<DataTemplate x:DataType="vm:WidgetsListControlItemViewModel">
440-
<Grid Padding="0,4,0,0">
437+
<Grid>
441438
<Expander
442-
Padding="0"
439+
Padding="16,0,16,0"
443440
HorizontalAlignment="Stretch"
444441
HorizontalContentAlignment="Stretch"
445442
AutomationProperties.Name="{x:Bind WidgetAutomationProperties, Mode=OneWay}"
@@ -474,7 +471,7 @@
474471
x:Name="MenuFlyout"
475472
Width="36"
476473
Height="32"
477-
Margin="16,0"
474+
Margin="0,8,50,0"
478475
Padding="0"
479476
HorizontalAlignment="Right"
480477
VerticalAlignment="Top"
@@ -487,7 +484,7 @@
487484
<FontIcon
488485
HorizontalAlignment="Center"
489486
VerticalAlignment="Center"
490-
FontSize="16"
487+
FontSize="14"
491488
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
492489
Glyph="&#xE712;" />
493490

0 commit comments

Comments
 (0)