v0.7.6 with fixes (#612)

lukeblevins · tsvietOK · jeffsieu · web-flow · commit 16171ff2e817 · 2020-04-16T16:25:34.000-04:00
* Fix new folder/file creation looses focus with each letter (#607) * Fix Download folder location (#610) Get other default folders locations same way * Don't create folder or file if dialog was canceled (#608) * Add Invert Selection, icons to status bar, fix folder navigation and remove space before .dll (#604) * Remove space before .dll * Add Invert Selection, fix folder navigation crash Also fixes critical bug where a folder is deleted if it's moved into itself and the user presses skip * Add multiligual resources for new string * Various fixes for v0.7.6 (#611) * Prevent crash on opening new tab from folder * Prevent opening multiple new tabs from blocking the UI * Remove TabView Transition Animations * Fix Item Thumbnails not Loading * Ensure file type property is loaded Co-authored-by: Vladyslav <tsvetkov_vlad@ukr.net> Co-authored-by: Jeff Sieu <jeffsy00@gmail.com>
diff --git a/Files/BaseLayout.cs b/Files/BaseLayout.cs
@@ -126,6 +126,8 @@ public BaseLayout()
 
         protected abstract void SetSelectedItemsOnUi(List<ListedItem> selectedItems);
 
+        public abstract void FocusSelectedItems();
+        
         protected abstract ListedItem GetItemFromElement(object element);
 
         private void AppSettings_LayoutModeChangeRequested(object sender, EventArgs e)
@@ -275,10 +277,6 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
 
         protected virtual void Page_CharacterReceived(CoreWindow sender, CharacterReceivedEventArgs args)
         {
-            var focusedElement = FocusManager.GetFocusedElement(XamlRoot) as FrameworkElement;
-            if (focusedElement is TextBox)
-                return;
-
             char letterPressed = Convert.ToChar(args.KeyCode);
             App.CurrentInstance.InteractionOperations.PushJumpChar(letterPressed);
         }
@@ -321,6 +319,11 @@ protected async void Item_DragStarting(object sender, DragStartingEventArgs e)
                     selectedStorageItems.Add(await StorageFolder.GetFolderFromPathAsync(item.ItemPath));
             }
 
+            if (selectedStorageItems.Count == 0) {
+                e.Cancel = true;
+                return;
+            }
+
             e.Data.SetStorageItems(selectedStorageItems);
             e.DragUI.SetContentFromDataPackage();
         }
@@ -354,7 +357,7 @@ protected async void Item_Drop(object sender, DragEventArgs e)
         protected void InitializeDrag(UIElement element)
         {
             ListedItem item = GetItemFromElement(element);
-            if(item != null)
+            if (item != null)
             {
                 element.AllowDrop = false;
                 element.DragStarting -= Item_DragStarting;
diff --git a/Files/Dialogs/AddItemDialog.xaml.cs b/Files/Dialogs/AddItemDialog.xaml.cs
@@ -57,7 +57,12 @@ public static async void CreateFile(AddItemType fileType)
             StorageFolder folderToCreateItem = await StorageFolder.GetFolderFromPathAsync(currentPath);
             RenameDialog renameDialog = new RenameDialog();
 
-            await renameDialog.ShowAsync();
+            var renameResult = await renameDialog.ShowAsync();
+            if (renameResult == ContentDialogResult.Secondary)
+            {
+                return;
+            }
+
             var userInput = renameDialog.storedRenameInput;
 
             if (fileType == AddItemType.Folder)
diff --git a/Files/Dialogs/RenameDialog.xaml b/Files/Dialogs/RenameDialog.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)" 
-    CornerRadius="4" Grid.RowSpan="4" DefaultButton="Primary" Title="Enter an item name" BorderThickness="0" SecondaryButtonClick="NameDialog_SecondaryButtonClick" PrimaryButtonClick="NameDialog_PrimaryButtonClick" x:Name="NameDialog" PrimaryButtonText="Set Name" SecondaryButtonText="Cancel" x:Uid="RenameDialog">
+    CornerRadius="4" Grid.RowSpan="4" DefaultButton="Primary" Title="Enter an item name" BorderThickness="0" PrimaryButtonClick="NameDialog_PrimaryButtonClick" x:Name="NameDialog" PrimaryButtonText="Set Name" SecondaryButtonText="Cancel" x:Uid="RenameDialog">
    
     <Grid MinWidth="300">
         <TextBox x:Name="RenameInput" x:Uid="RenameDialogInputText" PlaceholderText="Enter an item name without an extension" Height="35"/>
diff --git a/Files/Dialogs/RenameDialog.xaml.cs b/Files/Dialogs/RenameDialog.xaml.cs
@@ -32,11 +32,5 @@ private void NameDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogBu
         {
             storedRenameInput = inputBox.Text;
         }
-
-        private void NameDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
-        {
-            storedRenameInput = null;
-        }
-
     }
 }
diff --git a/Files/Helpers/NaturalStringComparer.cs b/Files/Helpers/NaturalStringComparer.cs
@@ -21,7 +21,7 @@ internal static class SafeNativeMethods
         public static readonly String LOCALE_NAME_INVARIANT = String.Empty;
         public static readonly String LOCALE_NAME_SYSTEM_DEFAULT = "!sys-default-locale";
 
-        [DllImport("api-ms-win-core-string-l1-1-0 .dll", CharSet = CharSet.Unicode)]
+        [DllImport("api-ms-win-core-string-l1-1-0.dll", CharSet = CharSet.Unicode)]
         public static extern Int32 CompareStringEx(
           String localeName,
           Int32 flags,
diff --git a/Files/Interacts/Interaction.cs b/Files/Interacts/Interaction.cs
@@ -105,25 +105,16 @@ public async void OpenInNewWindowItem_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        public void OpenDirectoryInNewTab_Click(object sender, RoutedEventArgs e)
+        public async void OpenDirectoryInNewTab_Click(object sender, RoutedEventArgs e)
         {
             var CurrentSourceType = App.CurrentInstance.CurrentPageType;
-            if (CurrentSourceType == typeof(GenericFileBrowser))
-            {
-                var items = (CurrentInstance.ContentPage as BaseLayout).SelectedItems;
-                foreach (ListedItem listedItem in items)
-                {
-                    instanceTabsView.AddNewTab(typeof(ModernShellPage), listedItem.ItemPath);
-                }
-
-            }
-            else if (CurrentSourceType == typeof(PhotoAlbum))
+            var items = (CurrentInstance.ContentPage as BaseLayout).SelectedItems;
+            foreach (ListedItem listedItem in items)
             {
-                var items = (CurrentInstance.ContentPage as BaseLayout).SelectedItems;
-                foreach (ListedItem listedItem in items)
+                await CoreWindow.GetForCurrentThread().Dispatcher.RunAsync(CoreDispatcherPriority.Low, () => 
                 {
                     instanceTabsView.AddNewTab(typeof(ModernShellPage), listedItem.ItemPath);
-                }
+                });
             }
         }
 
@@ -943,7 +934,7 @@ public async Task PasteItems(DataPackageView packageView, string destinationPath
 
             if (acceptedOperation == DataPackageOperation.Move)
             {
-                foreach (IStorageItem item in itemsToPaste)
+                foreach (IStorageItem item in pastedItems)
                 {
                     if (item.IsOfType(StorageItemTypes.File))
                     {
@@ -965,6 +956,7 @@ public async Task PasteItems(DataPackageView packageView, string destinationPath
                 List<string> pastedItemPaths = pastedItems.Select(item => item.Path).ToList();
                 List<ListedItem> copiedItems = CurrentInstance.ViewModel.FilesAndFolders.Where(listedItem => pastedItemPaths.Contains(listedItem.ItemPath)).ToList();
                 CurrentInstance.ContentPage.SelectedItems = copiedItems;
+                CurrentInstance.ContentPage.FocusSelectedItems();
             }
             packageView.ReportOperationCompleted(acceptedOperation);
         }
@@ -1087,34 +1079,21 @@ await CoreApplication.MainView.Dispatcher.RunAsync(CoreDispatcherPriority.Normal
 
         public void SelectAllItems()
         {
-            if (App.CurrentInstance.CurrentPageType == typeof(GenericFileBrowser))
-            {
-                var CurrentInstance = App.CurrentInstance;
-                foreach (ListedItem li in (CurrentInstance.ContentPage as GenericFileBrowser).AllView.ItemsSource)
-                {
-                    if (!(CurrentInstance.ContentPage as GenericFileBrowser).SelectedItems.Contains(li))
-                    {
-                        (CurrentInstance.ContentPage as GenericFileBrowser).AllView.SelectedItems.Add(li);
-                    }
-                }
-            }
-            else if (App.CurrentInstance.CurrentPageType == typeof(PhotoAlbum))
-            {
-                (CurrentInstance.ContentPage as PhotoAlbum).FileList.SelectAll();
-            }
+            CurrentInstance.ContentPage.SelectedItems = App.CurrentInstance.ViewModel.FilesAndFolders.ToList();
+        }
+
+        public void InvertAllItems()
+        {
+            List<ListedItem> oldSelectedItems = CurrentInstance.ContentPage.SelectedItems;
+            List<ListedItem> newSelectedItems = CurrentInstance.ViewModel.FilesAndFolders.ToList();
+            foreach (ListedItem listedItem in oldSelectedItems)
+                newSelectedItems.Remove(listedItem);
+            CurrentInstance.ContentPage.SelectedItems = newSelectedItems;
         }
 
         public void ClearAllItems()
         {
-            if (App.CurrentInstance.CurrentPageType == typeof(GenericFileBrowser))
-            {
-                var CurrentInstance = App.CurrentInstance;
-                (CurrentInstance.ContentPage as GenericFileBrowser).AllView.SelectedItems.Clear();
-            }
-            else if (App.CurrentInstance.CurrentPageType == typeof(PhotoAlbum))
-            {
-                (CurrentInstance.ContentPage as PhotoAlbum).FileList.SelectedItems.Clear();
-            }
+            CurrentInstance.ContentPage.SelectedItems = new List<ListedItem>();
         }
 
         public void ToggleQuickLook_Click(object sender, RoutedEventArgs e)
diff --git a/Files/MultilingualResources/Files.de-DE.xlf b/Files/MultilingualResources/Files.de-DE.xlf
@@ -578,6 +578,10 @@
           <source>Settings</source>
           <target state="new">Settings</target>
         </trans-unit>
+        <trans-unit id="StatusBarControlInvertSelection.Text" translate="yes" xml:space="preserve">
+          <source>Invert Selection</source>
+          <target state="new">Invert Selection</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.es-ES.xlf b/Files/MultilingualResources/Files.es-ES.xlf
@@ -574,7 +574,11 @@
           <source>Settings</source>
           <target state="translated">Ajustes</target>
         </trans-unit>
+        <trans-unit id="StatusBarControlInvertSelection.Text" translate="yes" xml:space="preserve">
+          <source>Invert Selection</source>
+          <target state="new">Invert Selection</target>
+        </trans-unit>
       </group>
     </body>
   </file>
-</xliff>
+</xliff>
diff --git a/Files/MultilingualResources/Files.fr-FR.xlf b/Files/MultilingualResources/Files.fr-FR.xlf
@@ -576,6 +576,10 @@
           <source>Settings</source>
           <target state="new">Settings</target>
         </trans-unit>
+        <trans-unit id="StatusBarControlInvertSelection.Text" translate="yes" xml:space="preserve">
+          <source>Invert Selection</source>
+          <target state="new">Invert Selection</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.nl-NL.xlf b/Files/MultilingualResources/Files.nl-NL.xlf
@@ -576,6 +576,10 @@
           <source>Settings</source>
           <target state="new">Settings</target>
         </trans-unit>
+        <trans-unit id="StatusBarControlInvertSelection.Text" translate="yes" xml:space="preserve">
+          <source>Invert Selection</source>
+          <target state="new">Invert Selection</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.pl-PL.xlf b/Files/MultilingualResources/Files.pl-PL.xlf
@@ -576,6 +576,10 @@
           <source>Settings</source>
           <target state="new">Settings</target>
         </trans-unit>
+        <trans-unit id="StatusBarControlInvertSelection.Text" translate="yes" xml:space="preserve">
+          <source>Invert Selection</source>
+          <target state="new">Invert Selection</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.ru-RU.xlf b/Files/MultilingualResources/Files.ru-RU.xlf
@@ -577,6 +577,10 @@
           <source>Settings</source>
           <target state="new">Settings</target>
         </trans-unit>
+        <trans-unit id="StatusBarControlInvertSelection.Text" translate="yes" xml:space="preserve">
+          <source>Invert Selection</source>
+          <target state="new">Invert Selection</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.tr-TR.xlf b/Files/MultilingualResources/Files.tr-TR.xlf
@@ -576,6 +576,10 @@
           <source>Settings</source>
           <target state="new">Settings</target>
         </trans-unit>
+        <trans-unit id="StatusBarControlInvertSelection.Text" translate="yes" xml:space="preserve">
+          <source>Invert Selection</source>
+          <target state="new">Invert Selection</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.uk-UA.xlf b/Files/MultilingualResources/Files.uk-UA.xlf
@@ -577,6 +577,10 @@
           <source>Settings</source>
           <target state="new">Settings</target>
         </trans-unit>
+        <trans-unit id="StatusBarControlInvertSelection.Text" translate="yes" xml:space="preserve">
+          <source>Invert Selection</source>
+          <target state="new">Invert Selection</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/MultilingualResources/Files.zh-Hans.xlf b/Files/MultilingualResources/Files.zh-Hans.xlf
@@ -576,6 +576,10 @@
           <source>Settings</source>
           <target state="new">Settings</target>
         </trans-unit>
+        <trans-unit id="StatusBarControlInvertSelection.Text" translate="yes" xml:space="preserve">
+          <source>Invert Selection</source>
+          <target state="new">Invert Selection</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw
@@ -155,7 +155,7 @@
   </data>
   <data name="ModernNavigationToolbaNewTextDocument.Text" xml:space="preserve">
     <value>Text Document</value>
-  </data> 
+  </data>
   <data name="NavigationToolbarCopyPath.Text" xml:space="preserve">
     <value>Copy Path</value>
   </data>
@@ -219,21 +219,24 @@
   <data name="StatusBarControlSelectAll.Text" xml:space="preserve">
     <value>Select All</value>
   </data>
+  <data name="StatusBarControlInvertSelection.Text" xml:space="preserve">
+    <value>Invert Selection</value>
+  </data>
   <data name="StatusBarControlClearSelection.Text" xml:space="preserve">
     <value>Clear Selection</value>
-  </data>  
+  </data>
   <data name="StatusBarControlListView.Text" xml:space="preserve">
     <value>List View</value>
   </data>
   <data name="StatusBarControlGridView.Text" xml:space="preserve">
     <value>Grid View</value>
-  </data>  
+  </data>
   <data name="PropertiesModified.Text" xml:space="preserve">
     <value>Modified:</value>
   </data>
   <data name="RecentItemClearAll.Text" xml:space="preserve">
     <value>Clear all items</value>
-  </data>  
+  </data>
   <data name="NavigationToolbarVisiblePath.PlaceholderText" xml:space="preserve">
     <value>Enter a path</value>
   </data>
diff --git a/Files/UserControls/LayoutModes/GenericFileBrowser.xaml.cs b/Files/UserControls/LayoutModes/GenericFileBrowser.xaml.cs
@@ -86,9 +86,9 @@ protected override void SetSelectedItemOnUi(ListedItem selectedItem)
             {
                 AllView.SelectedItem = selectedItem;
                 AllView.UpdateLayout();
-                AllView.ScrollIntoView(AllView.SelectedItem, null);
             }
         }
+
         protected override void SetSelectedItemsOnUi(List<ListedItem> selectedItems)
         {
             // To prevent program from crashing when the page is first loaded
@@ -108,6 +108,10 @@ protected override void SetSelectedItemsOnUi(List<ListedItem> selectedItems)
             foreach (ListedItem selectedItem in selectedItems)
                 AllView.SelectedItems.Add(selectedItem);
             AllView.UpdateLayout();
+        }
+
+        public override void FocusSelectedItems()
+        {
             AllView.ScrollIntoView(AllView.ItemsSource.Cast<ListedItem>().Last(), null);
         }
 
@@ -136,14 +140,14 @@ private async void ViewModel_PropertyChanged(object sender, PropertyChangedEvent
                 // Swap arrows
                 SortedColumn = _sortedColumn;
             }
-            else if (e.PropertyName == "isLoadingItems")
+            else if (e.PropertyName == "IsLoadingItems")
             {
                 if (!AssociatedViewModel.IsLoadingItems && AssociatedViewModel.FilesAndFolders.Count > 0)
                 {
                     var allRows = new List<DataGridRow>();
 
                     Interacts.Interaction.FindChildren<DataGridRow>(allRows, AllView);
-                    foreach (DataGridRow row in allRows.Take(20))
+                    foreach (DataGridRow row in allRows.Take(25))
                     {
                         if (!(row.DataContext as ListedItem).ItemPropertiesInitialized)
                         {
@@ -216,7 +220,7 @@ private async void AllView_Sorting(object sender, DataGridColumnEventArgs e)
                 var allRows = new List<DataGridRow>();
 
                 Interacts.Interaction.FindChildren<DataGridRow>(allRows, AllView);
-                foreach (DataGridRow row in allRows.Take(20))
+                foreach (DataGridRow row in allRows.Take(25))
                 {
                     if (!(row.DataContext as ListedItem).ItemPropertiesInitialized)
                     {
@@ -256,6 +260,12 @@ protected override void Page_CharacterReceived(CoreWindow sender, CharacterRecei
             {
                 if (App.CurrentInstance.CurrentPageType == typeof(GenericFileBrowser))
                 {
+                    var focusedElement = FocusManager.GetFocusedElement(XamlRoot) as FrameworkElement;
+                    if (focusedElement is TextBox)
+                    {
+                        return;
+                    }
+
                     base.Page_CharacterReceived(sender, args);
                     AllView.Focus(FocusState.Keyboard);
                 }
diff --git a/Files/UserControls/LayoutModes/PhotoAlbum.xaml.cs b/Files/UserControls/LayoutModes/PhotoAlbum.xaml.cs
diff --git a/Files/UserControls/StatusBarControl.xaml b/Files/UserControls/StatusBarControl.xaml
diff --git a/Files/View Models/ItemViewModel.cs b/Files/View Models/ItemViewModel.cs
diff --git a/Files/View Models/SelectedItemPropertiesViewModel.cs b/Files/View Models/SelectedItemPropertiesViewModel.cs
diff --git a/Files/View Models/SettingsViewModel.cs b/Files/View Models/SettingsViewModel.cs
diff --git a/Files/Views/InstanceTabsView.xaml b/Files/Views/InstanceTabsView.xaml
diff --git a/Files/Views/InstanceTabsView.xaml.cs b/Files/Views/InstanceTabsView.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,8 @@ public BaseLayout()`
`126`	`126`
`127`	`127`	`protected abstract void SetSelectedItemsOnUi(List<ListedItem> selectedItems);`
`128`	`128`
	`129`	`+ public abstract void FocusSelectedItems();`
	`130`	`+`
`129`	`131`	`protected abstract ListedItem GetItemFromElement(object element);`
`130`	`132`
`131`	`133`	`private void AppSettings_LayoutModeChangeRequested(object sender, EventArgs e)`
`@@ -275,10 +277,6 @@ private void Page_Loaded(object sender, RoutedEventArgs e)`
`275`	`277`
`276`	`278`	`protected virtual void Page_CharacterReceived(CoreWindow sender, CharacterReceivedEventArgs args)`
`277`	`279`	`{`
`278`		`- var focusedElement = FocusManager.GetFocusedElement(XamlRoot) as FrameworkElement;`
`279`		`- if (focusedElement is TextBox)`
`280`		`- return;`
`281`		`-`
`282`	`280`	`char letterPressed = Convert.ToChar(args.KeyCode);`
`283`	`281`	`App.CurrentInstance.InteractionOperations.PushJumpChar(letterPressed);`
`284`	`282`	`}`
`@@ -321,6 +319,11 @@ protected async void Item_DragStarting(object sender, DragStartingEventArgs e)`
`321`	`319`	`selectedStorageItems.Add(await StorageFolder.GetFolderFromPathAsync(item.ItemPath));`
`322`	`320`	`}`
`323`	`321`
	`322`	`+ if (selectedStorageItems.Count == 0) {`
	`323`	`+ e.Cancel = true;`
	`324`	`+ return;`
	`325`	`+ }`
	`326`	`+`
`324`	`327`	`e.Data.SetStorageItems(selectedStorageItems);`
`325`	`328`	`e.DragUI.SetContentFromDataPackage();`
`326`	`329`	`}`
`@@ -354,7 +357,7 @@ protected async void Item_Drop(object sender, DragEventArgs e)`
`354`	`357`	`protected void InitializeDrag(UIElement element)`
`355`	`358`	`{`
`356`	`359`	`ListedItem item = GetItemFromElement(element);`
`357`		`- if(item != null)`
	`360`	`+ if (item != null)`
`358`	`361`	`{`
`359`	`362`	`element.AllowDrop = false;`
`360`	`363`	`element.DragStarting -= Item_DragStarting;`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,5 @@ private void NameDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogBu`
`32`	`32`	`{`
`33`	`33`	`storedRenameInput = inputBox.Text;`
`34`	`34`	`}`
`35`		`-`
`36`		`- private void NameDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)`
`37`		`- {`
`38`		`- storedRenameInput = null;`
`39`		`- }`
`40`		`-`
`41`	`35`	`}`
`42`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,9 @@ protected override void SetSelectedItemOnUi(ListedItem selectedItem)`
`86`	`86`	`{`
`87`	`87`	`AllView.SelectedItem = selectedItem;`
`88`	`88`	`AllView.UpdateLayout();`
`89`		`- AllView.ScrollIntoView(AllView.SelectedItem, null);`
`90`	`89`	`}`
`91`	`90`	`}`
	`91`	`+`
`92`	`92`	`protected override void SetSelectedItemsOnUi(List<ListedItem> selectedItems)`
`93`	`93`	`{`
`94`	`94`	`// To prevent program from crashing when the page is first loaded`
`@@ -108,6 +108,10 @@ protected override void SetSelectedItemsOnUi(List<ListedItem> selectedItems)`
`108`	`108`	`foreach (ListedItem selectedItem in selectedItems)`
`109`	`109`	`AllView.SelectedItems.Add(selectedItem);`
`110`	`110`	`AllView.UpdateLayout();`
	`111`	`+ }`
	`112`	`+`
	`113`	`+ public override void FocusSelectedItems()`
	`114`	`+ {`
`111`	`115`	`AllView.ScrollIntoView(AllView.ItemsSource.Cast<ListedItem>().Last(), null);`
`112`	`116`	`}`
`113`	`117`
`@@ -136,14 +140,14 @@ private async void ViewModel_PropertyChanged(object sender, PropertyChangedEvent`
`136`	`140`	`// Swap arrows`
`137`	`141`	`SortedColumn = _sortedColumn;`
`138`	`142`	`}`
`139`		`- else if (e.PropertyName == "isLoadingItems")`
	`143`	`+ else if (e.PropertyName == "IsLoadingItems")`
`140`	`144`	`{`
`141`	`145`	`if (!AssociatedViewModel.IsLoadingItems && AssociatedViewModel.FilesAndFolders.Count > 0)`
`142`	`146`	`{`
`143`	`147`	`var allRows = new List<DataGridRow>();`
`144`	`148`
`145`	`149`	`Interacts.Interaction.FindChildren<DataGridRow>(allRows, AllView);`
`146`		`- foreach (DataGridRow row in allRows.Take(20))`
	`150`	`+ foreach (DataGridRow row in allRows.Take(25))`
`147`	`151`	`{`
`148`	`152`	`if (!(row.DataContext as ListedItem).ItemPropertiesInitialized)`
`149`	`153`	`{`
`@@ -216,7 +220,7 @@ private async void AllView_Sorting(object sender, DataGridColumnEventArgs e)`
`216`	`220`	`var allRows = new List<DataGridRow>();`
`217`	`221`
`218`	`222`	`Interacts.Interaction.FindChildren<DataGridRow>(allRows, AllView);`
`219`		`- foreach (DataGridRow row in allRows.Take(20))`
	`223`	`+ foreach (DataGridRow row in allRows.Take(25))`
`220`	`224`	`{`
`221`	`225`	`if (!(row.DataContext as ListedItem).ItemPropertiesInitialized)`
`222`	`226`	`{`
`@@ -256,6 +260,12 @@ protected override void Page_CharacterReceived(CoreWindow sender, CharacterRecei`
`256`	`260`	`{`
`257`	`261`	`if (App.CurrentInstance.CurrentPageType == typeof(GenericFileBrowser))`
`258`	`262`	`{`
	`263`	`+ var focusedElement = FocusManager.GetFocusedElement(XamlRoot) as FrameworkElement;`
	`264`	`+ if (focusedElement is TextBox)`
	`265`	`+ {`
	`266`	`+ return;`
	`267`	`+ }`
	`268`	`+`
`259`	`269`	`base.Page_CharacterReceived(sender, args);`
`260`	`270`	`AllView.Focus(FocusState.Keyboard);`
`261`	`271`	`}`