Skip to content

Fix: Fixed issue where the network icon was blank #10839

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

Merged
merged 15 commits into from
Dec 26, 2022
Merged

Fix: Fixed issue where the network icon was blank #10839

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1ac966d
Fix network icon
hecksmosis Dec 24, 2022
5d1a8de
Fix formatting
hecksmosis Dec 24, 2022
83247b7
Change icon to normal folder icon
hecksmosis Dec 25, 2022
7797033
Change icon to normal folder icon
hecksmosis Dec 25, 2022
f8fbbb1
Merge branch 'main' into fixNetIcon
hecksmosis Dec 25, 2022
df5e546
Update DriveItem.cs
hecksmosis Dec 25, 2022
c34c164
Clean code up
hecksmosis Dec 26, 2022
8fb2bac
Clean code up
hecksmosis Dec 26, 2022
a1707c9
Merge branch 'main' into fixNetIcon
hecksmosis Dec 26, 2022
4777779
Clean code up more
hecksmosis Dec 26, 2022
4422504
Merge branch 'fixNetIcon' of https://github.com/hecksmosis/Files into…
hecksmosis Dec 26, 2022
d73f480
Merge branch 'main' into fixNetIcon
hecksmosis Dec 26, 2022
c95bfca
Update DriveItem.cs
hecksmosis Dec 26, 2022
b6fe903
Simplify conditional
hecksmosis Dec 26, 2022
d762de9
Simplify conditional
hecksmosis Dec 26, 2022
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
14 changes: 6 additions & 8 deletions src/Files.App/DataModels/NavigationControlItems/DriveItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
using Microsoft.UI.Xaml.Media.Imaging;
using System;
using System.Threading.Tasks;
using Windows.Media.Capture;
using Windows.Storage;
using Windows.Storage.Streams;
using static Vanara.PInvoke.Shell32;

namespace Files.App.DataModels.NavigationControlItems
{
Expand Down Expand Up @@ -223,14 +225,10 @@ public async Task LoadDriveIcon()
{
if (IconData is null)
{
if (!string.IsNullOrEmpty(DeviceID))
if (!string.IsNullOrEmpty(DeviceID) && !string.Equals(DeviceID, "network-folder"))
IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, 24);

if (IconData is null)
{
var resource = UIHelpers.GetIconResourceInfo(Constants.ImageRes.Folder);
IconData = resource?.IconData;
}

IconData ??= UIHelpers.GetIconResourceInfo(Constants.ImageRes.Folder).IconData;
}
Icon = await IconData.ToBitmapAsync();
}
Expand All @@ -257,4 +255,4 @@ public enum DriveType
VirtualDrive,
CloudDrive,
}
}
}