Skip to content

Fix: Fixed issue with tab icon not loading properly #11328

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 2 commits into from
Feb 16, 2023
Merged

Fix: Fixed issue with tab icon not loading properly #11328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eea724e
Fix issue with tab icon not loading properly
marcelwgn Feb 16, 2023
fa61e98
Fix formatting
marcelwgn Feb 16, 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
Binary file modified src/Files.App/Assets/FilesOpenDialog/FilesLauncher.exe
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion src/Files.App/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
Margin="{ThemeResource TabViewItemHeaderIconMargin}">
<ContentControl
x:Name="IconControl"
Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TabViewTemplateSettings.IconElement}"
Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TabViewTemplateSettings.IconElement, Mode=OneWay}"
Foreground="{ThemeResource TabViewItemIconForeground}"
HighContrastAdjustment="None"
IsTabStop="False" />
Expand Down Expand Up @@ -609,6 +609,7 @@
Header="{x:Bind Header, Mode=OneWay}"
IconSource="{x:Bind IconSource, Mode=OneWay}"
Style="{StaticResource Local.TabViewItem}"
Loaded="TabViewItem_Loaded"
ToolTipService.ToolTip="{x:Bind ToolTipText, Mode=OneWay}" />
</DataTemplate>
</TabView.TabItemTemplate>
Expand Down
15 changes: 15 additions & 0 deletions src/Files.App/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using CommunityToolkit.WinUI.UI;
using Files.App.Extensions;
using Files.App.Helpers;
using Files.App.ViewModels;
Expand All @@ -8,6 +9,7 @@
using System.Linq;
using Windows.ApplicationModel.DataTransfer;
using Windows.Storage;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Tab;

// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236

Expand Down Expand Up @@ -235,5 +237,18 @@ public Visibility TabStripVisibility
DependencyProperty.Register("TabStripVisibility", typeof(Visibility), typeof(HorizontalMultitaskingControl), new PropertyMetadata(Visibility.Visible));

public Rectangle DragArea => DragAreaRectangle;

private void TabViewItem_Loaded(object sender, RoutedEventArgs e)
{
if (sender is TabViewItem tvi && tvi.FindDescendant("IconControl") is ContentControl control)
{
control.Content = (tvi.IconSource as ImageIconSource).CreateIconElement();
tvi.RegisterPropertyChangedCallback(TabViewItem.IconSourceProperty, (s, args) =>
{
if (s is TabViewItem tabViewItem && tabViewItem.FindDescendant("IconControl") is ContentControl iconControl)
iconControl.Content = (tabViewItem.IconSource as ImageIconSource).CreateIconElement();
});
}
}
}
}