Display Properties Correctly

lukeblevins · lukeblevins · commit 305584dbacf4 · 2019-12-30T15:01:45.000-05:00
diff --git a/Files/Controls/RibbonArea.xaml.cs b/Files/Controls/RibbonArea.xaml.cs
@@ -305,16 +305,8 @@ private async void LayoutButton_Click(object sender, RoutedEventArgs e)
 
         public async void ShowPropertiesButton_Click(object sender, RoutedEventArgs e)
         {
-            if (parentPage.ItemDisplayFrame.SourcePageType == typeof(GenericFileBrowser))
-            {
-                App.propertiesDialog.accessiblePropertiesFrame.Tag = App.propertiesDialog;
-                App.propertiesDialog.accessiblePropertiesFrame.Navigate(typeof(Properties), (parentPage.ItemDisplayFrame.Content as GenericFileBrowser).AllView.SelectedItems, new SuppressNavigationTransitionInfo());
-            }
-            else if (parentPage.ItemDisplayFrame.SourcePageType == typeof(PhotoAlbum))
-            {
-                App.propertiesDialog.accessiblePropertiesFrame.Tag = App.propertiesDialog;
-                App.propertiesDialog.accessiblePropertiesFrame.Navigate(typeof(Properties), (parentPage.ItemDisplayFrame.Content as PhotoAlbum).FileList.SelectedItems, new SuppressNavigationTransitionInfo());
-            }
+            App.propertiesDialog.accessiblePropertiesFrame.Tag = App.propertiesDialog;
+            App.propertiesDialog.accessiblePropertiesFrame.Navigate(typeof(Properties), (App.OccupiedInstance.ItemDisplayFrame.Content as BaseLayout).SelectedItem, new SuppressNavigationTransitionInfo());
             await App.propertiesDialog.ShowAsync(ContentDialogPlacement.Popup);
         }
 
diff --git a/Files/Dialogs/PropertiesDialog.xaml b/Files/Dialogs/PropertiesDialog.xaml
@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
     xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)" 
-    PrimaryButtonText="OK" DefaultButton="Primary" CloseButtonText="Cancel" CornerRadius="4" x:Name="PropertiesDialogMarkup" Title="Properties" >
+    PrimaryButtonText="OK" CornerRadius="4" DefaultButton="Primary" CloseButtonText="Cancel" x:Name="PropertiesDialogMarkup" Title="Properties" >
     
-    <Frame Width="400" Height="450" x:Name="propertiesFrame" />
+    <Frame Width="375" Height="425" x:Name="propertiesFrame" />
 </ContentDialog>
diff --git a/Files/Filesystem/ItemViewModel.cs b/Files/Filesystem/ItemViewModel.cs
@@ -550,7 +550,7 @@ public async void AddItemsToCollectionAsync(string path)
 
                         if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(GenericFileBrowser))
                         {
-                            _options.SetThumbnailPrefetch(ThumbnailMode.ListView, 20, ThumbnailOptions.ResizeThumbnail);
+                            _options.SetThumbnailPrefetch(ThumbnailMode.ListView, 40, ThumbnailOptions.ResizeThumbnail);
                             _options.SetPropertyPrefetch(PropertyPrefetchOptions.BasicProperties, new string[] { "System.DateModified", "System.ContentType", "System.Size", "System.FileExtension" });
                         }
                         else if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(PhotoAlbum))
@@ -566,7 +566,7 @@ public async void AddItemsToCollectionAsync(string path)
 
                         if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(GenericFileBrowser))
                         {
-                            _options.SetThumbnailPrefetch(ThumbnailMode.ListView, 20, ThumbnailOptions.ResizeThumbnail);
+                            _options.SetThumbnailPrefetch(ThumbnailMode.ListView, 40, ThumbnailOptions.ResizeThumbnail);
                             _options.SetPropertyPrefetch(PropertyPrefetchOptions.BasicProperties, new string[] { "System.DateModified", "System.ContentType", "System.ItemPathDisplay", "System.Size", "System.FileExtension" });
                         }
                         else if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(PhotoAlbum))
@@ -741,13 +741,13 @@ private async Task AddFile(StorageFile file)
             {
                 try
                 {
-                    var itemThumbnailImg = await file.GetThumbnailAsync(ThumbnailMode.ListView, 20, ThumbnailOptions.ResizeThumbnail);
+                    var itemThumbnailImg = await file.GetThumbnailAsync(ThumbnailMode.ListView, 40, ThumbnailOptions.UseCurrentScale);
                     if (itemThumbnailImg != null)
                     {
                         itemEmptyImgVis = Visibility.Collapsed;
                         itemThumbnailImgVis = Visibility.Visible;
-                        icon.DecodePixelWidth = 20;
-                        icon.DecodePixelHeight = 20;
+                        icon.DecodePixelWidth = 40;
+                        icon.DecodePixelHeight = 40;
                         await icon.SetSourceAsync(itemThumbnailImg);
                     }
                     else
@@ -768,7 +768,7 @@ private async Task AddFile(StorageFile file)
             {
                 try
                 {
-                    var itemThumbnailImg = await file.GetThumbnailAsync(ThumbnailMode.ListView, 80, ThumbnailOptions.ResizeThumbnail);
+                    var itemThumbnailImg = await file.GetThumbnailAsync(ThumbnailMode.ListView, 80, ThumbnailOptions.UseCurrentScale);
                     if (itemThumbnailImg != null)
                     {
                         itemEmptyImgVis = Visibility.Collapsed;
diff --git a/Files/Properties.xaml b/Files/Properties.xaml
@@ -8,7 +8,7 @@
     xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
     x:Class="Files.Properties"
     mc:Ignorable="d"
-    Width="400" Height="450">
+    Width="375" Height="425">
 
     <Grid>
         <StackPanel>
@@ -17,12 +17,12 @@
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <Custom:DockPanel x:Name="Icon" Margin="15,15" Width="45" Height="45" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                    <FontIcon FontSize="36" Visibility="{x:Bind Item.FolderImg,Mode=OneTime}" Glyph="&#xE8D5;" FontFamily="Segoe MDL2 Assets" Foreground="#ffe793" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
-                    <FontIcon FontSize="36" Visibility="{x:Bind Item.EmptyImgVis,Mode=OneTime}" Glyph="&#xE7C3;" FontFamily="Segoe MDL2 Assets" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
-                    <Image Visibility="{x:Bind Item.FileIconVis,Mode=OneTime}" x:Name="itemIcon" Source="{x:Bind Item.FileImg,Mode=OneTime}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+                <Custom:DockPanel x:Name="Icon" Margin="15,15" Width="40" Height="40" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                    <FontIcon FontSize="36" Visibility="{x:Bind Item.FolderImg}" Glyph="&#xE8D5;" FontFamily="Segoe MDL2 Assets" Foreground="#ffe793" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+                    <FontIcon FontSize="36" Visibility="{x:Bind Item.EmptyImgVis}" Glyph="&#xE7C3;" FontFamily="Segoe MDL2 Assets" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+                    <Image Visibility="{x:Bind Item.FileIconVis}" x:Name="itemIcon" Source="{x:Bind Item.FileImg}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
                 </Custom:DockPanel>
-                <TextBox CornerRadius="2" BorderThickness="1" Padding="10,4" x:Name="itemFileName" Text="{x:Bind Item.FileName,Mode=OneTime}" PlaceholderText="Item Name" VerticalAlignment="Center" Grid.Column="1" Margin="15,0,15,0" />
+                <TextBox IsReadOnly="True" CornerRadius="2" BorderThickness="1" Padding="10,4" x:Name="itemFileName" Text="{x:Bind Item.FileName}" PlaceholderText="Item Name" VerticalAlignment="Center" Grid.Column="1" Margin="15,0,15,0" />
             </Grid>
             <MenuFlyoutSeparator HorizontalAlignment="Stretch" Margin="-10,0"/>
             <Grid Padding="0,10">
@@ -31,23 +31,23 @@
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="Item type:"/>
-                <TextBlock Grid.Column="1" x:Name="itemType" Text="{x:Bind Item.FileType,Mode=OneTime}" />
+                <TextBlock IsTextSelectionEnabled="True" Grid.Column="1" x:Name="itemType" Text="{x:Bind Item.FileType}" />
             </Grid>
             <Grid Padding="0,10">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="90"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="Path:"/>
-                <TextBlock Grid.Column="2" x:Name="itemPath" Text="{x:Bind Item.FilePath,Mode=OneTime}" TextWrapping="Wrap" />
+                <TextBlock IsTextSelectionEnabled="True" Grid.Column="2" x:Name="itemPath" Text="{x:Bind Item.FilePath}" TextWrapping="Wrap" />
             </Grid>
             <Grid Padding="0,10">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="90"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="Size:"/>
-                <TextBlock Grid.Column="3" x:Name="itemSize" Text="{x:Bind Item.FileSize,Mode=OneTime}" />
+                <TextBlock IsTextSelectionEnabled="True" Grid.Column="3" x:Name="itemSize" Text="{x:Bind Item.FileSize}" />
             </Grid>
             <MenuFlyoutSeparator Margin="-10,0"/>
             <Grid Padding="0,10">
@@ -56,15 +56,15 @@
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="Created:"/>
-                <TextBlock Grid.Column="4" x:Name="itemCreatedTimestamp" Text="{x:Bind Item.FileDate,Mode=OneTime}" />
+                <TextBlock IsTextSelectionEnabled="True" Grid.Column="4" x:Name="itemCreatedTimestamp" Text="{x:Bind Item.FileDate}" />
             </Grid>
             <Grid Padding="0,10">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="90"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="Modified:"/>
-                <TextBlock Grid.Column="5" x:Name="itemModifiedTimestamp" Text="{x:Bind Item.FileDate,Mode=OneTime}"/>
+                <TextBlock IsTextSelectionEnabled="True" Grid.Column="5" x:Name="itemModifiedTimestamp" Text="{x:Bind Item.FileDate}"/>
             </Grid>
         </StackPanel>
         
diff --git a/Files/Properties.xaml.cs b/Files/Properties.xaml.cs
@@ -1,4 +1,5 @@
 ﻿using Files.Filesystem;
+using System.Collections.Generic;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 
@@ -16,9 +17,9 @@ public Properties()
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
+            base.OnNavigatedTo(e);
             Item = e.Parameter as ListedItem;
             PropertiesDialog = Frame.Tag as ContentDialog;
-            base.OnNavigatedTo(e);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ public async void AddItemsToCollectionAsync(string path)`
`550`	`550`
`551`	`551`	`if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(GenericFileBrowser))`
`552`	`552`	`{`
`553`		`- _options.SetThumbnailPrefetch(ThumbnailMode.ListView, 20, ThumbnailOptions.ResizeThumbnail);`
	`553`	`+ _options.SetThumbnailPrefetch(ThumbnailMode.ListView, 40, ThumbnailOptions.ResizeThumbnail);`
`554`	`554`	`_options.SetPropertyPrefetch(PropertyPrefetchOptions.BasicProperties, new string[] { "System.DateModified", "System.ContentType", "System.Size", "System.FileExtension" });`
`555`	`555`	`}`
`556`	`556`	`else if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(PhotoAlbum))`
`@@ -566,7 +566,7 @@ public async void AddItemsToCollectionAsync(string path)`
`566`	`566`
`567`	`567`	`if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(GenericFileBrowser))`
`568`	`568`	`{`
`569`		`- _options.SetThumbnailPrefetch(ThumbnailMode.ListView, 20, ThumbnailOptions.ResizeThumbnail);`
	`569`	`+ _options.SetThumbnailPrefetch(ThumbnailMode.ListView, 40, ThumbnailOptions.ResizeThumbnail);`
`570`	`570`	`_options.SetPropertyPrefetch(PropertyPrefetchOptions.BasicProperties, new string[] { "System.DateModified", "System.ContentType", "System.ItemPathDisplay", "System.Size", "System.FileExtension" });`
`571`	`571`	`}`
`572`	`572`	`else if (App.OccupiedInstance.ItemDisplayFrame.SourcePageType == typeof(PhotoAlbum))`
`@@ -741,13 +741,13 @@ private async Task AddFile(StorageFile file)`
`741`	`741`	`{`
`742`	`742`	`try`
`743`	`743`	`{`
`744`		`- var itemThumbnailImg = await file.GetThumbnailAsync(ThumbnailMode.ListView, 20, ThumbnailOptions.ResizeThumbnail);`
	`744`	`+ var itemThumbnailImg = await file.GetThumbnailAsync(ThumbnailMode.ListView, 40, ThumbnailOptions.UseCurrentScale);`
`745`	`745`	`if (itemThumbnailImg != null)`
`746`	`746`	`{`
`747`	`747`	`itemEmptyImgVis = Visibility.Collapsed;`
`748`	`748`	`itemThumbnailImgVis = Visibility.Visible;`
`749`		`- icon.DecodePixelWidth = 20;`
`750`		`- icon.DecodePixelHeight = 20;`
	`749`	`+ icon.DecodePixelWidth = 40;`
	`750`	`+ icon.DecodePixelHeight = 40;`
`751`	`751`	`await icon.SetSourceAsync(itemThumbnailImg);`
`752`	`752`	`}`
`753`	`753`	`else`
`@@ -768,7 +768,7 @@ private async Task AddFile(StorageFile file)`
`768`	`768`	`{`
`769`	`769`	`try`
`770`	`770`	`{`
`771`		`- var itemThumbnailImg = await file.GetThumbnailAsync(ThumbnailMode.ListView, 80, ThumbnailOptions.ResizeThumbnail);`
	`771`	`+ var itemThumbnailImg = await file.GetThumbnailAsync(ThumbnailMode.ListView, 80, ThumbnailOptions.UseCurrentScale);`
`772`	`772`	`if (itemThumbnailImg != null)`
`773`	`773`	`{`
`774`	`774`	`itemEmptyImgVis = Visibility.Collapsed;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Files.Filesystem;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using Windows.UI.Xaml.Controls;`
`3`	`4`	`using Windows.UI.Xaml.Navigation;`
`4`	`5`
`@@ -16,9 +17,9 @@ public Properties()`
`16`	`17`
`17`	`18`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`18`	`19`	`{`
	`20`	`+ base.OnNavigatedTo(e);`
`19`	`21`	`Item = e.Parameter as ListedItem;`
`20`	`22`	`PropertiesDialog = Frame.Tag as ContentDialog;`
`21`		`- base.OnNavigatedTo(e);`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`	`}`