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

Co-authored-by: Yair <[email protected]>

Author: ferrariofilippo

src/Files.App.Controls/ThemedIcon/ThemedIcon.Properties.cs

@@ -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();
+			});
+		}
 	}
 }

src/Files.App.Controls/ThemedIcon/ThemedIcon.cs

@@ -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()
@@ -252,4 +267,4 @@ private void OnIconSizeChanged()
 			Height = Width = IconSize;
 		}
 	}
-}
+}

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -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">
@@ -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"
@@ -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>