Skip to content

Commit be66d7c

Browse files
authored
Feature: Removed toolbar from homepage (#16589)
1 parent 45aa133 commit be66d7c

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

src/Files.App/Converters/MultiBooleanConverter.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ public static Boolean OrAndConvert(bool a, bool b, bool c)
2222
public static Visibility OrConvertToVisibility(bool a, bool b)
2323
=> (a || b) ? Visibility.Visible : Visibility.Collapsed;
2424

25+
public static Visibility AndConvertToVisibility(bool a, bool b)
26+
=> (a && b) ? Visibility.Visible : Visibility.Collapsed;
27+
2528
public static Visibility NorConvertToVisibility(bool a, bool b)
2629
=> !(a || b) ? Visibility.Visible : Visibility.Collapsed;
2730

src/Files.App/UserControls/InnerNavigationToolbar.xaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,6 @@
6666
<ColumnDefinition Width="Auto" />
6767
</Grid.ColumnDefinitions>
6868

69-
<!-- Home page header -->
70-
<TextBlock
71-
x:Name="HomePageHeaderTextBlock"
72-
Grid.Column="0"
73-
Margin="18,0,0,0"
74-
HorizontalAlignment="Left"
75-
VerticalAlignment="Center"
76-
x:Load="{x:Bind ViewModel.InstanceViewModel.IsPageTypeNotHome, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
77-
Style="{StaticResource App.Theme.SubtitleTextBlockStyle}"
78-
Text="{helpers:ResourceString Name=Home}" />
79-
8069
<!-- Context Commands -->
8170
<CommandBar
8271
x:Name="ContextCommandBar"

src/Files.App/Views/MainPage.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
x:Class="Files.App.Views.MainPage"
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6+
xmlns:converters="using:Files.App.Converters"
67
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
78
xmlns:helpers="using:Files.App.Helpers"
89
xmlns:i="using:Microsoft.Xaml.Interactivity"
@@ -205,7 +206,7 @@
205206
ShowPreviewPaneButton="{x:Bind ViewModel.ShouldPreviewPaneBeDisplayed, Mode=OneWay}"
206207
ShowViewControlButton="{x:Bind ViewModel.ShouldViewControlBeDisplayed, Mode=OneWay}"
207208
TabIndex="2"
208-
Visibility="{x:Bind ViewModel.ShowToolbar, Mode=OneWay}" />
209+
Visibility="{x:Bind converters:MultiBooleanConverter.AndConvertToVisibility(SidebarAdaptiveViewModel.PaneHolder.ActivePaneOrColumn.InstanceViewModel.IsPageTypeNotHome, ViewModel.ShowToolbar), Mode=OneWay}" />
209210

210211
<!-- Page Content -->
211212
<ContentPresenter

0 commit comments

Comments
 (0)