Skip to content

Commit fafcd41

Browse files
lukeblevinslukeblevins
committed
Don't display filesystem path of Libraries when refreshed
1 parent 330651a commit fafcd41

File tree

7 files changed

+290
-61
lines changed

7 files changed

+290
-61
lines changed

‎App.xaml

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,43 @@
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
55
<Application.Resources>
6+
67
<ResourceDictionary>
7-
<ResourceDictionary.ThemeDictionaries>
8-
<ResourceDictionary x:Key="Light">
9-
10-
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
11-
BackgroundSource="Backdrop"
12-
TintColor="LightSlateGray"
13-
TintOpacity="0.6"/>
14-
<SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="#FFFAFAFA"/>
15-
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
8+
<ResourceDictionary.MergedDictionaries>
9+
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"/>
10+
<ResourceDictionary>
11+
<ResourceDictionary.ThemeDictionaries>
12+
<ResourceDictionary x:Key="Default">
13+
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
14+
BackgroundSource="Backdrop"
15+
TintColor="LightSlateGray"
16+
TintOpacity="0.6"/>
17+
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
18+
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
19+
</ResourceDictionary>
20+
<ResourceDictionary x:Key="Light">
21+
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
22+
BackgroundSource="Backdrop"
23+
TintColor="LightSlateGray"
24+
TintOpacity="0.6"/>
25+
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
26+
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
27+
</ResourceDictionary>
28+
<ResourceDictionary x:Key="Dark">
29+
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
30+
BackgroundSource="Backdrop"
31+
TintColor="Black"
32+
TintOpacity="0.6"/>
33+
<AcrylicBrush x:Key="NavigationViewTopPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.8" TintColor="Black" FallbackColor="#FF494949"/>
34+
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="Black" FallbackColor="#FF494949"/>
35+
</ResourceDictionary>
36+
<ResourceDictionary x:Key="HighContrast">
37+
<!-- This empty dictionary ensures that the default high contrast resources are used when the user turns on high contrast mode. -->
38+
</ResourceDictionary>
39+
</ResourceDictionary.ThemeDictionaries>
1640
</ResourceDictionary>
17-
<ResourceDictionary x:Key="Dark">
18-
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="Black" FallbackColor="#FF494949"/>
19-
</ResourceDictionary>
20-
<ResourceDictionary x:Key="HighContrast">
21-
<!-- This empty dictionary ensures that the default high contrast resources are used when the user turns on high contrast mode. -->
22-
</ResourceDictionary>
23-
</ResourceDictionary.ThemeDictionaries>
41+
</ResourceDictionary.MergedDictionaries>
42+
2443
</ResourceDictionary>
2544

2645

‎Files.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,9 @@
273273
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid">
274274
<Version>5.0.0</Version>
275275
</PackageReference>
276+
<PackageReference Include="Microsoft.UI.Xaml">
277+
<Version>2.1.190131001-prerelease</Version>
278+
</PackageReference>
276279
</ItemGroup>
277280
<ItemGroup>
278281
<None Include="Files_TemporaryKey.pfx" />

‎GenericFileBrowser.xaml

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
6+
xmlns:uilib="using:Microsoft.UI.Xaml.Controls"
67
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
78
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
89
xmlns:local="using:Files"
@@ -242,8 +243,8 @@
242243
</VisualStateGroup>
243244
</VisualStateManager.VisualStateGroups>
244245
<Grid Height="50" Width="50" x:Name="ContentRoot" MinHeight="50" Margin="0,0">
245-
246-
246+
247+
247248
<Viewbox x:Name="ContentViewbox" AutomationProperties.AccessibilityView="Raw" HorizontalAlignment="Stretch" Height="16" Margin="{StaticResource AppBarButtonContentViewboxCollapsedMargin}">
248249
<ContentPresenter x:Name="Content" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}"/>
249250
</Viewbox>
@@ -296,34 +297,34 @@
296297
<RowDefinition Height="Auto"/>
297298
<RowDefinition Height="80*"/>
298299
</Grid.RowDefinitions>
299-
<TextBlock Name="EmptyText" Visibility="{x:Bind local2:ItemViewModel.TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="425,135.2,0,0" Canvas.ZIndex="5" Grid.Row="2"/>
300+
<TextBlock Name="EmptyText" Visibility="{x:Bind local2:ItemViewModel.TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,55,0,0" Canvas.ZIndex="5" Grid.Row="2"/>
300301
<Grid DataContext="{Binding BackObject}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
301-
302-
<StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="-15,0,0,0">
303-
<StackPanel Orientation="Vertical" Margin="2">
302+
303+
<StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="-15,0,0,0">
304+
<StackPanel Orientation="Vertical" Margin="2">
304305
<AppBarButton LabelPosition="Collapsed" Style="{ThemeResource AppBarButtonFixedStyle}" HorizontalAlignment="Center" x:FieldModifier="public" IsEnabled="{x:Bind local2:ItemViewModel.BS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Back" VerticalAlignment="Center" Height="50" Width="50">
305-
306+
306307
<AppBarButton.ContentTemplate>
307308
<DataTemplate>
308309
<TextBlock Text="&#xE76B;" FontFamily="Segoe MDL2 Assets" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" />
309310
</DataTemplate>
310311
</AppBarButton.ContentTemplate>
311312
</AppBarButton>
312-
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" HorizontalAlignment="Center" TextAlignment="Center" Text="Back" Width="60"/>
313-
</StackPanel>
314-
<StackPanel Orientation="Vertical" Margin="2">
315-
<Grid HorizontalAlignment="Center" DataContext="{Binding ForwardObject}" VerticalAlignment="Center">
313+
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" HorizontalAlignment="Center" TextAlignment="Center" Text="Back" Width="60"/>
314+
</StackPanel>
315+
<StackPanel Orientation="Vertical" Margin="2">
316+
<Grid HorizontalAlignment="Center" DataContext="{Binding ForwardObject}" VerticalAlignment="Center">
316317
<AppBarButton LabelPosition="Collapsed" Style="{ThemeResource AppBarButtonFixedStyle}" IsEnabled="{x:Bind local2:ItemViewModel.FS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Forward" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Top" Height="50" Width="50" HorizontalAlignment="Left">
317318
<AppBarButton.ContentTemplate>
318319
<DataTemplate>
319320
<TextBlock Text="&#xE76C;" FontFamily="Segoe MDL2 Assets" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" />
320321
</DataTemplate>
321322
</AppBarButton.ContentTemplate>
322323
</AppBarButton>
323-
</Grid>
324-
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" TextAlignment="Center" HorizontalAlignment="Center" Text="Forward" Width="60"/>
325-
</StackPanel>
326-
<StackPanel Orientation="Vertical" Margin="2">
324+
</Grid>
325+
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" TextAlignment="Center" HorizontalAlignment="Center" Text="Forward" Width="60"/>
326+
</StackPanel>
327+
<StackPanel Orientation="Vertical" Margin="2">
327328
<AppBarButton LabelPosition="Collapsed" HorizontalAlignment="Center" x:Name="Refresh" Style="{ThemeResource AppBarButtonFixedStyle}" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50">
328329
<AppBarButton.ContentTemplate>
329330
<DataTemplate>
@@ -332,26 +333,28 @@
332333
</AppBarButton.ContentTemplate>
333334
</AppBarButton>
334335
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Refresh" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
335-
</StackPanel>
336-
<StackPanel Orientation="Vertical" Margin="2">
336+
</StackPanel>
337+
<StackPanel Orientation="Vertical" Margin="2">
337338
<AppBarButton LabelPosition="Collapsed" HorizontalAlignment="Center" x:Name="AddItem" Style="{ThemeResource AppBarButtonFixedStyle}" Content="&#xE710;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
338-
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Add Item" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
339-
</StackPanel>
340-
<StackPanel Orientation="Vertical" Margin="2">
339+
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Add Item" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
340+
</StackPanel>
341+
<StackPanel Orientation="Vertical" Margin="2">
341342
<AppBarButton LabelPosition="Collapsed" IsEnabled="{x:Bind local3:Interaction.PS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" x:Name="Paste" Style="{ThemeResource AppBarButtonFixedStyle}" Content="&#xE77F;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
342-
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Paste" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
343-
</StackPanel>
344-
<StackPanel Orientation="Vertical" Margin="2">
343+
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Paste" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
344+
</StackPanel>
345+
<StackPanel Orientation="Vertical" Margin="2">
345346
<AppBarButton LabelPosition="Collapsed" HorizontalAlignment="Center" x:Name="GetPath" Style="{ThemeResource AppBarButtonFixedStyle}" Content="&#xF271;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
346-
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Copy Path" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
347-
</StackPanel>
348-
<StackPanel Orientation="Vertical" Margin="2">
347+
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Copy Path" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
348+
</StackPanel>
349+
<StackPanel Orientation="Vertical" Margin="2">
349350
<AppBarButton LabelPosition="Collapsed" HorizontalAlignment="Center" x:Name="ViewMode" Style="{ThemeResource AppBarButtonFixedStyle}" Content="&#xF0E2;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
350-
<TextBlock VerticalAlignment="Bottom" TextWrapping="WrapWholeWords" Text="Layout Mode" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
351-
</StackPanel>
351+
<TextBlock VerticalAlignment="Bottom" TextWrapping="WrapWholeWords" Text="Layout Mode" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
352352
</StackPanel>
353+
</StackPanel>
354+
355+
356+
353357

354-
355358
</Grid>
356359

357360
<ScrollViewer Padding="5" HorizontalScrollMode="Auto" HorizontalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="1" >
@@ -444,7 +447,7 @@
444447
</controls:DataGridTemplateColumn.CellTemplate>
445448
</controls:DataGridTemplateColumn>
446449
<controls:DataGridTextColumn Header="Name" Width="385" Binding="{Binding FileName}" Tag="Name"/>
447-
<controls:DataGridTextColumn IsReadOnly="True" Header="Date modified" Width="300" Binding="{Binding FileDate}" Tag="Date"/>
450+
<controls:DataGridTextColumn IsReadOnly="True" Header="Date modified" Width="Auto" Binding="{Binding FileDate}" Tag="Date"/>
448451
<controls:DataGridTextColumn IsReadOnly="True" Header="Type" Width="150" Binding="{Binding FileExtension}" Tag="Type"/>
449452
<controls:DataGridTextColumn IsReadOnly="True" Header="Size" Binding="{Binding FileSize}" Tag="Size"/>
450453
</controls:DataGrid.Columns>

‎GenericFileBrowser.xaml.cs

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public GenericFileBrowser()
3030
this.InitializeComponent();
3131
GFBPageName = GenericItemView;
3232
string env = Environment.ExpandEnvironmentVariables("%userprofile%");
33-
var CoreTitleBar = CoreApplication.GetCurrentView().TitleBar;
34-
CoreTitleBar.ExtendViewIntoTitleBar = true;
35-
var titleBar = ApplicationView.GetForCurrentView().TitleBar;
33+
//var CoreTitleBar = CoreApplication.GetCurrentView().TitleBar;
34+
//CoreTitleBar.ExtendViewIntoTitleBar = false;
35+
//var titleBar = ApplicationView.GetForCurrentView().TitleBar;
3636
//titleBar.ButtonBackgroundColor = Color.FromArgb(100, 255, 255, 255);
37-
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
38-
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
37+
//titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
38+
//titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
3939
ProgressBox.Visibility = Visibility.Collapsed;
4040
ItemViewModel.TextState.isVisible = Visibility.Collapsed;
4141
ItemViewModel.PVIS.isVisible = Visibility.Collapsed;
@@ -84,15 +84,23 @@ await NewView.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
8484

8585
private void Clipboard_ContentChanged(object sender, object e)
8686
{
87-
DataPackageView packageView = Clipboard.GetContent();
88-
if (packageView.Contains(StandardDataFormats.StorageItems))
87+
try
8988
{
90-
Interacts.Interaction.PS.isEnabled = true;
89+
DataPackageView packageView = Clipboard.GetContent();
90+
if (packageView.Contains(StandardDataFormats.StorageItems))
91+
{
92+
Interacts.Interaction.PS.isEnabled = true;
93+
}
94+
else
95+
{
96+
Interacts.Interaction.PS.isEnabled = false;
97+
}
9198
}
92-
else
99+
catch (Exception)
93100
{
94101
Interacts.Interaction.PS.isEnabled = false;
95102
}
103+
96104
}
97105

98106
public static UniversalPath p = new UniversalPath();

‎MainPage.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public MainPage()
3131
CoreTitleBar.ExtendViewIntoTitleBar = true;
3232
Window.Current.SetTitleBar(DragArea);
3333
var titleBar = ApplicationView.GetForCurrentView().TitleBar;
34-
//titleBar.ButtonBackgroundColor = Color.FromArgb(100, 255, 255, 255);
34+
titleBar.ButtonBackgroundColor = Color.FromArgb(0, 255, 255, 255);
3535
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
3636
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
3737
nv = navView;

0 commit comments

Comments
 (0)