Skip to content

Fix: Fixed issue where the 'layout' icon didn't match the select layout #17436

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
Aug 13, 2025
Merged

Fix: Fixed issue where the 'layout' icon didn't match the select layout #17436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3323fd
Fix: Update toolbar's Layout icon on layout changes
ferrariofilippo Aug 12, 2025
79d057e
Dispose
ferrariofilippo Aug 12, 2025
88209e7
Suggested change
yaira2 Aug 13, 2025
d69fa24
Update ThemedIcon.cs
yaira2 Aug 13, 2025
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
17 changes: 17 additions & 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 @@ -97,5 +97,22 @@ partial void OnToggleBehaviorChanged(ToggleBehaviors newValue)
{
UpdateVisualStates();
}

private void OnStylePropertyChanged(DependencyObject sender, DependencyProperty dp)
{
if (dp != StyleProperty)
return;

DispatcherQueue.TryEnqueue(() =>
{
GetTemplateParts();
OnFilledIconChanged();
OnOutlineIconChanged();
OnLayeredIconChanged();
OnIconTypeChanged();
OnIconColorTypeChanged();
OnIconSizeChanged();
});
}
}
}
17 changes: 16 additions & 1 deletion src/Files.App.Controls/ThemedIcon/ThemedIcon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,24 @@ public partial class ThemedIcon : Control
private Viewbox? _layeredViewBox;
private Canvas? _layeredCanvas;

private long _stylePropertyChangedToken;

public ThemedIcon()
{
DefaultStyleKey = typeof(ThemedIcon);
_stylePropertyChangedToken = RegisterPropertyChangedCallback(
StyleProperty,
OnStylePropertyChanged
);

Unloaded += OnUnloaded;
}

private void OnUnloaded(object sender, RoutedEventArgs e)
{
UnregisterPropertyChangedCallback(StyleProperty, _stylePropertyChangedToken);
IsEnabledChanged -= OnIsEnabledChanged;
Unloaded -= OnUnloaded;
}

protected override void OnApplyTemplate()
Expand Down Expand Up @@ -252,4 +267,4 @@ private void OnIconSizeChanged()
Height = Width = IconSize;
}
}
}
}
10 changes: 5 additions & 5 deletions src/Files.App/UserControls/NavigationToolbar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,12 @@
<DataTemplate x:DataType="dataitems:NavigationBarSuggestionItem">
<Grid Padding="0,0,4,0" ColumnSpacing="12">
<Grid.ColumnDefinitions>
<!--<ColumnDefinition Width="Auto" />-->
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<!--<Grid
<Grid
Grid.Column="0"
Width="16"
Height="16">
Expand All @@ -314,12 +314,12 @@
</Viewbox>
<controls:ThemedIcon Style="{x:Bind ThemedIconStyle, Mode=OneWay}" Visibility="{x:Bind ThemedIconStyle, Converter={StaticResource NullToVisibilityCollapsedConverter}, Mode=OneWay}" />
<Image Source="{x:Bind ActionIconSource, Mode=OneWay}" />
</Grid>-->
</Grid>

<!-- Primary Title -->
<TextBlock
x:Name="PrimaryDisplayBlock"
Grid.Column="0"
Grid.Column="1"
VerticalAlignment="Center"
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
TextTrimming="CharacterEllipsis"
Expand All @@ -330,7 +330,7 @@
<!-- Keyboard Shortcuts -->
<keyboard:KeyboardShortcut
x:Name="RightAlignedKeyboardShortcut"
Grid.Column="1"
Grid.Column="2"
VerticalAlignment="Center"
HotKeys="{x:Bind HotKeys, Mode=OneWay}" />
</Grid>
Expand Down
Loading