Properties: Fixed Properties window crash on older systems (#1012)

Author: tsvietOK

Files/Dialogs/PropertiesDialog.xaml

@@ -6,14 +6,14 @@
     xmlns:local2="using:Files.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     x:Name="PropertiesDialogMarkup"
-    Title="Properties"
-    CornerRadius="4"
+    Background="Transparent"
     mc:Ignorable="d"
     RequestedTheme="{x:Bind local2:ThemeHelper.RootTheme}">
+    <ContentDialog.Resources>
+        <Thickness x:Key="ContentDialogPadding">0</Thickness>
+    </ContentDialog.Resources>
 
     <Frame
         x:Name="propertiesFrame"
-        Width="375"
-        Height="425"
         x:FieldModifier="public" />
 </ContentDialog>

Files/Interacts/Interaction.cs

@@ -42,7 +42,7 @@ namespace Files.Interacts
 {
     public class Interaction
     {
-	    private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         private readonly IShellPage CurrentInstance;
         private readonly InstanceTabsView instanceTabsView;
@@ -463,7 +463,7 @@ public void ShareItem_Click(object sender, RoutedEventArgs e)
         public static Dictionary<UIContext, AppWindow> AppWindows { get; set; }
             = new Dictionary<UIContext, AppWindow>();
 
-        private async void ShowProperties(object parameter)
+        private async void ShowProperties()
         {
             if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
             {
@@ -491,19 +491,19 @@ private async void ShowProperties(object parameter)
             else
             {
                 App.PropertiesDialogDisplay.propertiesFrame.Tag = App.PropertiesDialogDisplay;
-                App.PropertiesDialogDisplay.propertiesFrame.Navigate(typeof(Properties), parameter, new SuppressNavigationTransitionInfo());
+                App.PropertiesDialogDisplay.propertiesFrame.Navigate(typeof(Properties), null, new SuppressNavigationTransitionInfo());
                 await App.PropertiesDialogDisplay.ShowAsync(ContentDialogPlacement.Popup);
             }
         }
 
         public void ShowPropertiesButton_Click(object sender, RoutedEventArgs e)
         {
-            ShowProperties(App.CurrentInstance.ContentPage.SelectedItem);
+            ShowProperties();
         }
 
         public void ShowFolderPropertiesButton_Click(object sender, RoutedEventArgs e)
         {
-            ShowProperties(App.CurrentInstance.ViewModel.CurrentFolder);
+            ShowProperties();
         }
 
         private async void Manager_DataRequested(DataTransferManager sender, DataRequestedEventArgs args)

Files/Views/Pages/Properties.xaml.cs

@@ -20,6 +20,7 @@ public sealed partial class Properties : Page
         private static AppWindowTitleBar _TitleBar;
 
         public AppWindow propWindow;
+
         public ItemPropertiesViewModel ItemProperties { get; } = new ItemPropertiesViewModel();
 
         public Properties()
@@ -38,13 +39,16 @@ public Properties()
 
         private async void Properties_Loaded(object sender, RoutedEventArgs e)
         {
-            // Collect AppWindow-specific info
-            propWindow = Interaction.AppWindows[UIContext];
-            // Set properties window titleBar style
-            _TitleBar = propWindow.TitleBar;
-            _TitleBar.ButtonBackgroundColor = Colors.Transparent;
-            _TitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
-            App.AppSettings.UpdateThemeElements.Execute(null);
+            if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+            {
+                // Collect AppWindow-specific info
+                propWindow = Interaction.AppWindows[UIContext];
+                // Set properties window titleBar style
+                _TitleBar = propWindow.TitleBar;
+                _TitleBar.ButtonBackgroundColor = Colors.Transparent;
+                _TitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
+                App.AppSettings.UpdateThemeElements.Execute(null);
+            }
 
             if (App.CurrentInstance.ContentPage.IsItemSelected)
             {
@@ -123,22 +127,25 @@ private async void Properties_Loaded(object sender, RoutedEventArgs e)
         private void AppSettings_ThemeModeChanged(object sender, EventArgs e)
         {
             RequestedTheme = ThemeHelper.RootTheme;
-            switch (ThemeHelper.RootTheme)
+            if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
             {
-                case ElementTheme.Default:
-                    _TitleBar.ButtonHoverBackgroundColor = (Color)Application.Current.Resources["SystemBaseLowColor"];
-                    _TitleBar.ButtonForegroundColor = (Color)Application.Current.Resources["SystemBaseHighColor"];
-                    break;
-
-                case ElementTheme.Light:
-                    _TitleBar.ButtonHoverBackgroundColor = Color.FromArgb(51, 0, 0, 0);
-                    _TitleBar.ButtonForegroundColor = Colors.Black;
-                    break;
-
-                case ElementTheme.Dark:
-                    _TitleBar.ButtonHoverBackgroundColor = Color.FromArgb(51, 255, 255, 255);
-                    _TitleBar.ButtonForegroundColor = Colors.White;
-                    break;
+                switch (ThemeHelper.RootTheme)
+                {
+                    case ElementTheme.Default:
+                        _TitleBar.ButtonHoverBackgroundColor = (Color)Application.Current.Resources["SystemBaseLowColor"];
+                        _TitleBar.ButtonForegroundColor = (Color)Application.Current.Resources["SystemBaseHighColor"];
+                        break;
+
+                    case ElementTheme.Light:
+                        _TitleBar.ButtonHoverBackgroundColor = Color.FromArgb(51, 0, 0, 0);
+                        _TitleBar.ButtonForegroundColor = Colors.Black;
+                        break;
+
+                    case ElementTheme.Dark:
+                        _TitleBar.ButtonHoverBackgroundColor = Color.FromArgb(51, 255, 255, 255);
+                        _TitleBar.ButtonForegroundColor = Colors.White;
+                        break;
+                }
             }
         }
 
@@ -149,6 +156,10 @@ private async void Button_Click(object sender, RoutedEventArgs e)
             {
                 await propWindow.CloseAsync();
             }
+            else
+            {
+                App.PropertiesDialogDisplay.Hide();
+            }
         }
     }