Skip to content

Fix : Bug: Soft link file details layout information misaligned #15998 #16579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix : Bug: Soft link file details layout information misaligned #15998 #16579

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5760821
Symlinks misaligned issue fixed.
ashrafmansuri Dec 8, 2024
44cfc84
Merge branch 'main' into fix-softlink-filedetails
ashrafmansuri Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 43 additions & 20 deletions src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,27 +274,50 @@

if (isSymlink)
{
var targetPath = Win32Helper.ParseSymLink(itemPath);

return new ShortcutItem(null)
var targetPath = NativeFileOperationsHelper.ParseSymLink(itemPath);

Check failure on line 277 in src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs

View workflow job for this annotation

GitHub Actions / build (Debug, x64) 

The name 'NativeFileOperationsHelper' does not exist in the current context

Check failure on line 277 in src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs

View workflow job for this annotation

GitHub Actions / build (Debug, arm64) 

The name 'NativeFileOperationsHelper' does not exist in the current context

Check failure on line 277 in src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs

View workflow job for this annotation

GitHub Actions / build (Release, x64) 

The name 'NativeFileOperationsHelper' does not exist in the current context

Check failure on line 277 in src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs

View workflow job for this annotation

GitHub Actions / build (Release, arm64) 

The name 'NativeFileOperationsHelper' does not exist in the current context
if (isGitRepo)
{
PrimaryItemAttribute = StorageItemTypes.File,
FileExtension = itemFileExtension,
IsHiddenItem = isHidden,
Opacity = opacity,
FileImage = null,
LoadFileIcon = itemThumbnailImgVis,
ItemNameRaw = itemName,
ItemDateModifiedReal = itemModifiedDate,
ItemDateAccessedReal = itemLastAccessDate,
ItemDateCreatedReal = itemCreatedDate,
ItemType = "Shortcut".GetLocalizedResource(),
ItemPath = itemPath,
FileSize = itemSize,
FileSizeBytes = itemSizeBytes,
TargetPath = targetPath,
IsSymLink = true
};
return new GitItem()
{
PrimaryItemAttribute = StorageItemTypes.File,
FileExtension = itemFileExtension,
FileImage = null,
LoadFileIcon = itemThumbnailImgVis,
ItemNameRaw = itemName,
IsHiddenItem = isHidden,
Opacity = opacity,
ItemDateModifiedReal = itemModifiedDate,
ItemDateAccessedReal = itemLastAccessDate,
ItemDateCreatedReal = itemCreatedDate,
ItemType = itemType,
ItemPath = itemPath,
FileSize = itemSize,
FileSizeBytes = itemSizeBytes
};
}
else
{
return new ShortcutItem(null)
{
PrimaryItemAttribute = StorageItemTypes.File,
FileExtension = itemFileExtension,
IsHiddenItem = isHidden,
Opacity = opacity,
FileImage = null,
LoadFileIcon = itemThumbnailImgVis,
ItemNameRaw = itemName,
ItemDateModifiedReal = itemModifiedDate,
ItemDateAccessedReal = itemLastAccessDate,
ItemDateCreatedReal = itemCreatedDate,
ItemType = "Shortcut".GetLocalizedResource(),
ItemPath = itemPath,
FileSize = itemSize,
FileSizeBytes = itemSizeBytes,
TargetPath = targetPath,
IsSymLink = true
};
}

}
else if (FileExtensionHelpers.IsShortcutOrUrlFile(findData.cFileName))
{
Expand Down
Loading