Fixed an issue where double click to open an item would not work in ListView if the item was already selected (#2142)

gave92 · web-flow · commit eb5be8dc4cd2 · 2020-10-25T11:21:12.000-04:00
diff --git a/Files/MultilingualResources/Files.de-DE.xlf b/Files/MultilingualResources/Files.de-DE.xlf
@@ -1365,10 +1365,6 @@
           <source>App theme</source>
           <target state="translated">App-Design</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="translated">Doppelclicken, um Elemente umzubenennen</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="translated">Den Besitzer in den Eigenschaften anzeigen</target>
diff --git a/Files/MultilingualResources/Files.es-ES.xlf b/Files/MultilingualResources/Files.es-ES.xlf
@@ -1362,10 +1362,6 @@
           <source>App theme</source>
           <target state="translated">Tema de la aplicación</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="translated">Doble click para renombrar archivos</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="translated">Mostrar propietario de archivo en la ventana de propiedades</target>
diff --git a/Files/MultilingualResources/Files.fr-FR.xlf b/Files/MultilingualResources/Files.fr-FR.xlf
@@ -1363,10 +1363,6 @@
           <source>App theme</source>
           <target state="new">App theme</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="new">Double click to rename files</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="new">Show Owner in properties</target>
diff --git a/Files/MultilingualResources/Files.he-IL.xlf b/Files/MultilingualResources/Files.he-IL.xlf
@@ -1362,10 +1362,6 @@
           <source>App theme</source>
           <target state="new">App theme</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="new">Double click to rename files</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="new">Show Owner in properties</target>
diff --git a/Files/MultilingualResources/Files.hi-IN.xlf b/Files/MultilingualResources/Files.hi-IN.xlf
@@ -1374,10 +1374,6 @@
           <source>App theme</source>
           <target state="new">App theme</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="new">Double click to rename files</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="new">Show Owner in properties</target>
diff --git a/Files/MultilingualResources/Files.hu-HU.xlf b/Files/MultilingualResources/Files.hu-HU.xlf
@@ -242,10 +242,6 @@
           <source>Files and Folders</source>
           <target state="translated">Fájlok és Mappák</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="translated">Dupla kattintás átnevezéshez</target>
-        </trans-unit>
         <trans-unit id="SettingsExperimentalTitle.Text" translate="yes" xml:space="preserve">
           <source>Experimental</source>
           <target state="translated">Kísérleti</target>
diff --git a/Files/MultilingualResources/Files.it-IT.xlf b/Files/MultilingualResources/Files.it-IT.xlf
@@ -1363,10 +1363,6 @@
           <source>App theme</source>
           <target state="translated">Tema dell'app</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="translated">Doppio click per rinominare un file</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="translated">Mostra Proprietario del file nelle proprietà</target>
diff --git a/Files/MultilingualResources/Files.ja-JP.xlf b/Files/MultilingualResources/Files.ja-JP.xlf
@@ -1362,10 +1362,6 @@
           <source>App theme</source>
           <target state="translated">テーマ</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="translated">ダブルクリックしてファイルの名前を変更します</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="translated">プロパティに所有者を表示する</target>
diff --git a/Files/MultilingualResources/Files.nl-NL.xlf b/Files/MultilingualResources/Files.nl-NL.xlf
@@ -1376,10 +1376,6 @@
           <source>App theme</source>
           <target state="new">App theme</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="new">Double click to rename files</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="new">Show Owner in properties</target>
diff --git a/Files/MultilingualResources/Files.or-IN.xlf b/Files/MultilingualResources/Files.or-IN.xlf
@@ -1374,10 +1374,6 @@
           <source>App theme</source>
           <target state="new">App theme</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="new">Double click to rename files</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="new">Show Owner in properties</target>
diff --git a/Files/MultilingualResources/Files.pl-PL.xlf b/Files/MultilingualResources/Files.pl-PL.xlf
@@ -1375,10 +1375,6 @@
           <source>App theme</source>
           <target state="new">App theme</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="new">Double click to rename files</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="new">Show Owner in properties</target>
diff --git a/Files/MultilingualResources/Files.pt-BR.xlf b/Files/MultilingualResources/Files.pt-BR.xlf
@@ -1362,10 +1362,6 @@
           <source>App theme</source>
           <target state="translated">Tema do aplicativo</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="translated">Clique duas vezes para renomear arquivos</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="translated">Mostrar proprietário nas propriedades</target>
diff --git a/Files/MultilingualResources/Files.ru-RU.xlf b/Files/MultilingualResources/Files.ru-RU.xlf
@@ -1363,10 +1363,6 @@
           <source>App theme</source>
           <target state="new">App theme</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="new">Double click to rename files</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="new">Show Owner in properties</target>
diff --git a/Files/MultilingualResources/Files.ta.xlf b/Files/MultilingualResources/Files.ta.xlf
@@ -1374,10 +1374,6 @@
           <source>App theme</source>
           <target state="new">App theme</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="new">Double click to rename files</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="new">Show Owner in properties</target>
diff --git a/Files/MultilingualResources/Files.tr-TR.xlf b/Files/MultilingualResources/Files.tr-TR.xlf
@@ -1371,10 +1371,6 @@
           <source>App theme</source>
           <target state="new">App theme</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="new">Double click to rename files</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="new">Show Owner in properties</target>
diff --git a/Files/MultilingualResources/Files.uk-UA.xlf b/Files/MultilingualResources/Files.uk-UA.xlf
@@ -1363,10 +1363,6 @@
           <source>App theme</source>
           <target state="new">App theme</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="new">Double click to rename files</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="new">Show Owner in properties</target>
diff --git a/Files/MultilingualResources/Files.zh-Hans.xlf b/Files/MultilingualResources/Files.zh-Hans.xlf
@@ -1367,10 +1367,6 @@
           <source>App theme</source>
           <target state="new">App theme</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalDoubleTapToRenameFiles.Header" translate="yes" xml:space="preserve">
-          <source>Double click to rename files</source>
-          <target state="new">Double click to rename files</target>
-        </trans-unit>
         <trans-unit id="SettingsShowFileOwnerInProperties.Header" translate="yes" xml:space="preserve">
           <source>Show Owner in properties</source>
           <target state="new">Show Owner in properties</target>
diff --git a/Files/Strings/de-DE/Resources.resw b/Files/Strings/de-DE/Resources.resw
@@ -1029,9 +1029,6 @@
   <data name="SettingsAppearanceTheme.Header" xml:space="preserve">
     <value>App-Design</value>
   </data>
-  <data name="SettingsExperimentalDoubleTapToRenameFiles.Header" xml:space="preserve">
-    <value>Doppelclicken, um Elemente umzubenennen</value>
-  </data>
   <data name="SettingsShowFileOwnerInProperties.Header" xml:space="preserve">
     <value>Den Besitzer in den Eigenschaften anzeigen</value>
   </data>
diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw
@@ -294,9 +294,6 @@
   <data name="SettingsFilesAndFoldersTitle.Text" xml:space="preserve">
     <value>Files and Folders</value>
   </data>
-  <data name="SettingsExperimentalDoubleTapToRenameFiles.Header" xml:space="preserve">
-    <value>Double click to rename files</value>
-  </data>
   <data name="SettingsExperimentalTitle.Text" xml:space="preserve">
     <value>Experimental</value>
   </data>
diff --git a/Files/Strings/es-ES/Resources.resw b/Files/Strings/es-ES/Resources.resw
@@ -987,9 +987,6 @@
   <data name="SettingsAppearanceTheme.Header" xml:space="preserve">
     <value>Tema de la aplicación</value>
   </data>
-  <data name="SettingsExperimentalDoubleTapToRenameFiles.Header" xml:space="preserve">
-    <value>Doble click para renombrar archivos</value>
-  </data>
   <data name="SettingsShowFileOwnerInProperties.Header" xml:space="preserve">
     <value>Mostrar propietario de archivo en la ventana de propiedades</value>
   </data>
diff --git a/Files/Strings/hu-HU/Resources.resw b/Files/Strings/hu-HU/Resources.resw
@@ -189,9 +189,6 @@
   <data name="SettingsFilesAndFoldersTitle.Text" xml:space="preserve">
     <value>Fájlok és Mappák</value>
   </data>
-  <data name="SettingsExperimentalDoubleTapToRenameFiles.Header" xml:space="preserve">
-    <value>Dupla kattintás átnevezéshez</value>
-  </data>
   <data name="SettingsExperimentalTitle.Text" xml:space="preserve">
     <value>Kísérleti</value>
   </data>
diff --git a/Files/Strings/it-IT/Resources.resw b/Files/Strings/it-IT/Resources.resw
@@ -1029,9 +1029,6 @@
   <data name="SettingsAppearanceTheme.Header" xml:space="preserve">
     <value>Tema dell'app</value>
   </data>
-  <data name="SettingsExperimentalDoubleTapToRenameFiles.Header" xml:space="preserve">
-    <value>Doppio click per rinominare un file</value>
-  </data>
   <data name="SettingsShowFileOwnerInProperties.Header" xml:space="preserve">
     <value>Mostra Proprietario del file nelle proprietà</value>
   </data>
diff --git a/Files/Strings/ja-JP/Resources.resw b/Files/Strings/ja-JP/Resources.resw
@@ -1029,9 +1029,6 @@
   <data name="SettingsAppearanceTheme.Header" xml:space="preserve">
     <value>テーマ</value>
   </data>
-  <data name="SettingsExperimentalDoubleTapToRenameFiles.Header" xml:space="preserve">
-    <value>ダブルクリックしてファイルの名前を変更します</value>
-  </data>
   <data name="SettingsShowFileOwnerInProperties.Header" xml:space="preserve">
     <value>プロパティに所有者を表示する</value>
   </data>
diff --git a/Files/Strings/pt-BR/Resources.resw b/Files/Strings/pt-BR/Resources.resw
@@ -1029,9 +1029,6 @@
   <data name="SettingsAppearanceTheme.Header" xml:space="preserve">
     <value>Tema do aplicativo</value>
   </data>
-  <data name="SettingsExperimentalDoubleTapToRenameFiles.Header" xml:space="preserve">
-    <value>Clique duas vezes para renomear arquivos</value>
-  </data>
   <data name="SettingsShowFileOwnerInProperties.Header" xml:space="preserve">
     <value>Mostrar proprietário nas propriedades</value>
   </data>
diff --git a/Files/View Models/SettingsViewModel.cs b/Files/View Models/SettingsViewModel.cs
@@ -53,7 +53,6 @@ public SettingsViewModel()
             Analytics.TrackEvent("ThemeValue " + ThemeHelper.RootTheme.ToString());
             Analytics.TrackEvent("PinOneDriveToSideBar " + PinOneDriveToSideBar.ToString());
             Analytics.TrackEvent("PinRecycleBinToSideBar " + PinRecycleBinToSideBar.ToString());
-            Analytics.TrackEvent("DoubleTapToRenameFiles " + DoubleTapToRenameFiles.ToString());
             Analytics.TrackEvent("ShowFileExtensions " + ShowFileExtensions.ToString());
             Analytics.TrackEvent("ShowConfirmDeleteDialog " + ShowConfirmDeleteDialog.ToString());
             Analytics.TrackEvent("AcrylicSidebar " + AcrylicEnabled.ToString());
@@ -416,12 +415,6 @@ public string WinDirPath
             set => SetProperty(ref _WinDirPath, value);
         }
 
-        public bool DoubleTapToRenameFiles
-        {
-            get => Get(true);
-            set => Set(value);
-        }
-
         public bool ShowFileExtensions
         {
             get => Get(true);
diff --git a/Files/Views/LayoutModes/GenericFileBrowser.xaml.cs b/Files/Views/LayoutModes/GenericFileBrowser.xaml.cs
@@ -4,6 +4,7 @@
 using Files.UserControls;
 using Microsoft.Toolkit.Uwp.UI;
 using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections;
@@ -63,6 +64,7 @@ public GenericFileBrowser()
             InitializeComponent();
             base.BaseLayoutContextFlyout = this.BaseLayoutContextFlyout;
             base.BaseLayoutItemContextFlyout = this.BaseLayoutItemContextFlyout;
+            this.tapDebounceTimer = new DispatcherTimer();
             switch (AppSettings.DirectorySortOption)
             {
                 case SortOption.Name:
@@ -256,6 +258,8 @@ await Window.Current.CoreWindow.Dispatcher.RunIdleAsync((e) =>
 
         private TextBox renamingTextBox;
 
+        private DispatcherTimer tapDebounceTimer;
+
         private void AllView_PreparingCellForEdit(object sender, DataGridPreparingCellForEditEventArgs e)
         {
             if (App.CurrentInstance.FilesystemViewModel.WorkingDirectory.StartsWith(AppSettings.RecycleBinPath))
@@ -265,20 +269,30 @@ private void AllView_PreparingCellForEdit(object sender, DataGridPreparingCellFo
                 return;
             }
 
-            // Check if the double tap to rename files setting is off
-            if (!AppSettings.DoubleTapToRenameFiles || AppSettings.OpenItemsWithOneclick)
+            // Only cancel if this event was triggered by a tap
+            // Do not cancel when user presses F2 or context menu
+            if (e.EditingEventArgs is TappedRoutedEventArgs)
             {
-                // Only cancel if this event was triggered by a tap
-                // Do not cancel when user presses F2 or context menu
-                if (e.EditingEventArgs is TappedRoutedEventArgs)
+                if (AppSettings.OpenItemsWithOneclick)
                 {
                     AllView.CancelEdit(); // Cancel the edit operation
-                    if (!AppSettings.OpenItemsWithOneclick) // With OpenItemsWithOneclick file will be opened on pointer released
-                    {
-                        App.CurrentInstance.InteractionOperations.OpenItem_Click(null, null); // Open the file instead
-                    }
                     return;
                 }
+                if (!tapDebounceTimer.IsEnabled)
+                {
+                    tapDebounceTimer.Debounce(() =>
+                    {
+                        tapDebounceTimer.Stop();
+                        AllView.BeginEdit(); // EditingEventArgs will be null
+                    }, TimeSpan.FromMilliseconds(500), false);
+                }
+                else
+                {
+                    tapDebounceTimer.Stop();
+                    App.CurrentInstance.InteractionOperations.OpenItem_Click(null, null); // Open selected files
+                }
+                AllView.CancelEdit(); // Cancel the edit operation
+                return;
             }
 
             int extensionLength = SelectedItem.FileExtension?.Length ?? 0;
diff --git a/Files/Views/SettingsPages/Experimental.xaml b/Files/Views/SettingsPages/Experimental.xaml
@@ -33,12 +33,6 @@
                     FontStyle="Italic"
                     Text="WARNING: EXPERIMENTAL FEATURES AHEAD!" />
 
-                <ToggleSwitch
-                    x:Uid="SettingsExperimentalDoubleTapToRenameFiles"
-                    Header="Double tap to rename files"
-                    HeaderTemplate="{StaticResource CustomHeaderStyle}"
-                    IsOn="{x:Bind AppSettings.DoubleTapToRenameFiles, Mode=TwoWay}" />
-
                 <ToggleSwitch
                     x:Uid="SettingsShowFileOwnerInProperties"
                     Header="Show Owner in properties"
