Skip to content

Fix: Fixed an issue where tags would sometimes display with the wrong color #16603

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 4 commits into from
Dec 17, 2024
Merged

Fix: Fixed an issue where tags would sometimes display with the wrong color #16603

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4d82f5
Fix: Tag icons may use the wrong color
ferrariofilippo Dec 13, 2024
03194dd
Partial revert
ferrariofilippo Dec 15, 2024
0e602a2
Naming
ferrariofilippo Dec 16, 2024
d51748b
Requested changes
ferrariofilippo Dec 17, 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
1 change: 1 addition & 0 deletions src/Files.App.Controls/ThemedIcon/ThemedIcon.Properties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ protected virtual void OnOutlineIconPropertyChanged(string oldValue, string newV
protected virtual void OnColorPropertyChanged(Brush oldValue, Brush newValue)
{
OnIconTypeChanged();
UpdateColor(newValue);
}

protected virtual void OnIconTypePropertyChanged(ThemedIconTypes oldValue, ThemedIconTypes newValue)
Expand Down
9 changes: 9 additions & 0 deletions src/Files.App.Controls/ThemedIcon/ThemedIcon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,5 +240,14 @@ private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArg
{
UpdateVisualStates();
}

private void UpdateColor(Brush newColor)
{
if (GetTemplateChild(OutlineIconPath) is Path outlinePath)
outlinePath.Fill = newColor;

if (GetTemplateChild(FilledIconPath) is Path fillPath)
fillPath.Fill = newColor;
}
}
}
4 changes: 2 additions & 2 deletions src/Files.App.Controls/ThemedIcon/ThemedIcon.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@
</VisualState>
<VisualState x:Name="Custom">
<VisualState.Setters>
<Setter Target="PART_OutlinePath.Fill" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Color}" />
<Setter Target="PART_FilledPath.Fill" Value="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Color}" />
<Setter Target="PART_OutlinePath.Fill" Value="{Binding Color, Mode=OneTime}" />
<Setter Target="PART_FilledPath.Fill" Value="{Binding Color, Mode=OneTime}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Toggle">
Expand Down