Skip to content
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

Fix: Fixed issue where the tab sometimes had the wrong icon #12190

Merged
merged 9 commits into from
Jun 4, 2023
Merged

Fix: Fixed issue where the tab sometimes had the wrong icon #12190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4faf02a
explicitly set the tab icon and header for WSL distributions
marcofranzen99 Apr 24, 2023
38e8028
explicitly set the tab icon for cloud drives
marcofranzen99 Apr 24, 2023
d407b25
removed unused usings
marcofranzen99 Apr 24, 2023
82ce238
Merge remote-tracking branch 'upstream/main' into 11795_incorrect_tab…
marcofranzen99 Apr 26, 2023
865f79a
include namespace
marcofranzen99 May 1, 2023
59c113b
Merge remote-tracking branch 'upstream/main' into 11795_incorrect_tab…
marcofranzen99 May 1, 2023
10b86fe
Merge branch 'main' into 11795_incorrect_tab_icon
yaira2 May 22, 2023
e34a53b
Merge branch 'main' into 11795_incorrect_tab_icon
yaira2 May 29, 2023
09d416f
Merge branch 'main' into 11795_incorrect_tab_icon
yaira2 May 30, 2023
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
9 changes: 2 additions & 7 deletions src/Files.App/Filesystem/WSLDistroManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
// Copyright (c) 2023 Files Community
// Licensed under the MIT License. See the LICENSE.

using Files.App.Data.Items;
using Files.App.Helpers;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Threading.Tasks;
using System.Diagnostics.CodeAnalysis;
using Windows.Storage;
using static Files.App.Constants;

Expand Down Expand Up @@ -63,7 +58,7 @@ public async Task UpdateDrivesAsync()
}
}

public bool TryGetDistro(string path, out WslDistroItem? distro)
public bool TryGetDistro(string path, [NotNullWhen(true)] out WslDistroItem? distro)
{
var normalizedPath = PathNormalization.NormalizePath(path);
distro = Distros.FirstOrDefault(x => normalizedPath.StartsWith(PathNormalization.NormalizePath(x.Path), StringComparison.OrdinalIgnoreCase));
Expand Down
14 changes: 11 additions & 3 deletions src/Files.App/ViewModels/MainPageViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
using Files.App.UserControls.MultitaskingControl;
using Files.App.Views;
using Files.Backend.Services;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Media.Imaging;
using Microsoft.UI.Xaml.Navigation;
using System.Windows.Input;
using Windows.System;
Expand Down Expand Up @@ -187,16 +189,16 @@ public async Task UpdateTabInfo(TabItem tabItem, object navigationArg)
}
}

public async Task<(string tabLocationHeader, Microsoft.UI.Xaml.Controls.IconSource tabIcon, string toolTipText)> GetSelectedTabInfoAsync(string currentPath)
public async Task<(string tabLocationHeader, IconSource tabIcon, string toolTipText)> GetSelectedTabInfoAsync(string currentPath)
{
string? tabLocationHeader;
var iconSource = new Microsoft.UI.Xaml.Controls.ImageIconSource();
var iconSource = new ImageIconSource();
string toolTipText = currentPath;

if (string.IsNullOrEmpty(currentPath) || currentPath == "Home")
{
tabLocationHeader = "Home".GetLocalizedResource();
iconSource.ImageSource = new Microsoft.UI.Xaml.Media.Imaging.BitmapImage(new Uri(Constants.FluentIconsPaths.HomeIcon));
iconSource.ImageSource = new BitmapImage(new Uri(Constants.FluentIconsPaths.HomeIcon));
}
else if (currentPath.Equals(Constants.UserEnvironmentPaths.DesktopPath, StringComparison.OrdinalIgnoreCase))
{
Expand Down Expand Up @@ -224,12 +226,18 @@ public async Task UpdateTabInfo(TabItem tabItem, object navigationArg)
// If localized string is empty use the library name.
tabLocationHeader = string.IsNullOrEmpty(libName) ? library.Text : libName;
}
else if (App.WSLDistroManager.TryGetDistro(currentPath, out WslDistroItem? wslDistro) && currentPath.Equals(wslDistro.Path))
{
tabLocationHeader = wslDistro.Text;
iconSource.ImageSource = new BitmapImage(wslDistro.Logo);
}
else
{
var normalizedCurrentPath = PathNormalization.NormalizePath(currentPath);
var matchingCloudDrive = App.CloudDrivesManager.Drives.FirstOrDefault(x => normalizedCurrentPath.Equals(PathNormalization.NormalizePath(x.Path), StringComparison.OrdinalIgnoreCase));
if (matchingCloudDrive is not null)
{
iconSource.ImageSource = matchingCloudDrive.Icon;
tabLocationHeader = matchingCloudDrive.Text;
}
else if (PathNormalization.NormalizePath(PathNormalization.GetPathRoot(currentPath)) == normalizedCurrentPath) // If path is a drive's root
Expand Down