Skip to content

Commit 7e3c318

Browse files
committed
Fix UI bug in DataGrid renaming
Renaming of files and folders can now be done in GenericFileBrowser without needing to explicitly click on the name cell of the item.
1 parent ef5f03d commit 7e3c318

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Files UWP/Interacts/Interaction.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -825,6 +825,7 @@ public void RenameItem_Click(object sender, RoutedEventArgs e)
825825
if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
826826
{
827827
var fileBrowser = App.selectedTabInstance.accessibleContentFrame.Content as GenericFileBrowser;
828+
fileBrowser.AllView.CurrentColumn = fileBrowser.AllView.Columns[1];
828829
fileBrowser.AllView.BeginEdit();
829830
}
830831
else if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))
@@ -838,22 +839,23 @@ public async Task<bool> RenameFileItem(ListedItem item, string oldName, string n
838839
{
839840
if (oldName == newName)
840841
return true;
842+
bool isRenamedSameNameDiffCase = oldName.ToLower() == newName.ToLower();
841843
try
842844
{
843845
if (newName != "")
844846
{
845847
if (item.FileType == "Folder")
846848
{
847849
var folder = await StorageFolder.GetFolderFromPathAsync(item.FilePath);
848-
if (oldName.ToLower() == newName.ToLower())
850+
if (isRenamedSameNameDiffCase)
849851
await folder.RenameAsync(newName, NameCollisionOption.ReplaceExisting);
850852
else
851853
await folder.RenameAsync(newName, NameCollisionOption.FailIfExists);
852854
}
853855
else
854856
{
855857
var file = await StorageFile.GetFileFromPathAsync(item.FilePath);
856-
if (oldName.ToLower() == newName.ToLower())
858+
if (isRenamedSameNameDiffCase)
857859
await file.RenameAsync(newName, NameCollisionOption.ReplaceExisting);
858860
else
859861
await file.RenameAsync(newName, NameCollisionOption.FailIfExists);

0 commit comments

Comments
 (0)