Improved ThemedIcon size setting

Author: 0x5bfa

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

@@ -16,5 +16,8 @@ public partial class Omnibar
 	{
 		[GeneratedDependencyProperty]
 		public partial IList<OmnibarMode>? Modes { get; set; }
+
+		[GeneratedDependencyProperty]
+		public partial OmnibarMode? CurrentActiveMode { get; set; }
 	}
 }

src/Files.App.Controls/Omnibar/Omnibar.cs

@@ -93,8 +93,11 @@ internal void ChangeExpandedMode(OmnibarMode modeToExpand)
 				VisualStateManager.GoToState(mode, "Collapsed", true);
 
 			// Expand the given mode
+			VisualStateManager.GoToState(modeToExpand, "Focused", true);
 			VisualStateManager.GoToState(modeToExpand, "Visible", true);
 			_modesHostGrid.ColumnDefinitions[_modesHostGrid.Children.IndexOf(modeToExpand)].Width = new(1, GridUnitType.Star);
+
+			CurrentActiveMode = modeToExpand;
 		}
 
 		private void UpdateVisualStates()

src/Files.App.Controls/Omnibar/OmnibarMode.Properties.cs

@@ -41,12 +41,6 @@ public partial class OmnibarMode
 		[GeneratedDependencyProperty]
 		internal partial bool IsHostFocused { get; set; }
 
-		//partial void OnHostChanged(Grid? newValue)
-		//{
-		//	if (_isHostInitialized)
-		//		throw new InvalidOperationException("Host is already set and cannot be changed again.");
-		//}
-
 		partial void OnIsHostFocusedChanged(bool newValue)
 		{
 			UpdateVisualStates();

src/Files.App.Controls/Omnibar/OmnibarMode.cs

@@ -12,8 +12,14 @@ namespace Files.App.Controls
 {
 	// Template parts
 	[TemplatePart(Name = "PART_ModeClickBorder", Type = typeof(Border))]
+	[TemplatePart(Name = "PART_ModeIconPresenter", Type = typeof(ContentPresenter))]
 	[TemplatePart(Name = "PART_InputTextBox", Type = typeof(TextBox))]
 	// Visual states
+	[TemplateVisualState(Name = "PointerNormal", GroupName = "CommonStates")]
+	[TemplateVisualState(Name = "PointerOver", GroupName = "CommonStates")]
+	[TemplateVisualState(Name = "PointerPressed", GroupName = "CommonStates")]
+	[TemplateVisualState(Name = "Focused", GroupName = "CommonStates")]
+	// Visual states
 	[TemplateVisualState(Name = "Collapsed", GroupName = "InputVisibilityStates")]
 	[TemplateVisualState(Name = "Visible", GroupName = "InputVisibilityStates")]
 	public partial class OmnibarMode : Control

src/Files.App.Controls/Omnibar/OmnibarMode.xaml

@@ -38,7 +38,11 @@
 								<BrushTransition Duration="0:0:0.083" />
 							</Border.BackgroundTransition>
 
-							<ContentPresenter HorizontalAlignment="Center" Content="{TemplateBinding IconOnInactive}" />
+							<ContentPresenter
+								x:Name="PART_ModeIconPresenter"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								Content="{TemplateBinding IconOnInactive}" />
 						</Border>
 
 						<TextBox
@@ -78,6 +82,11 @@
 										<Setter Target="PART_ModeClickBorder.Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
 									</VisualState.Setters>
 								</VisualState>
+								<VisualState x:Name="Focused">
+									<VisualState.Setters>
+										<Setter Target="PART_ModeIconPresenter.Content" Value="{TemplateBinding IconOnActive}" />
+									</VisualState.Setters>
+								</VisualState>
 							</VisualStateGroup>
 
 							<VisualStateGroup x:Name="InputVisibilityStates">

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

@@ -48,6 +48,7 @@ protected virtual void OnIconColorTypePropertyChanged(ThemedIconColorType oldVal
 		protected virtual void OnIconSizePropertyChanged(double oldValue, double newValue)
 		{
 			UpdateVisualStates();
+			OnIconSizeChanged();
 		}
 
 		protected virtual void OnIsToggledPropertyChanged(bool oldValue, bool newValue)

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

@@ -43,6 +43,7 @@ protected override void OnApplyTemplate()
 
 			OnIconTypeChanged();
 			OnIconColorTypeChanged();
+			OnIconSizeChanged();
 		}
 
 		private void GetTemplateParts()
@@ -249,5 +250,10 @@ private void OnIconColorChanged()
 			if (GetTemplateChild(FilledIconPath) is Path fillPath)
 				fillPath.Fill = (Brush)this.GetValue(ColorProperty);
 		}
+
+		private void OnIconSizeChanged()
+		{
+			Height = Width = IconSize;
+		}
 	}
 }

tests/Files.App.UITests/Views/OmnibarPage.xaml

@@ -71,16 +71,12 @@
 					TextPlaceholder="Enter text...">
 					<controls:OmnibarMode.IconOnActive>
 						<controls:ThemedIcon
-							Width="16"
-							Height="16"
+							IconColorType="Normal"
 							IsFilled="True"
 							Style="{StaticResource App.ThemedIcons.Omnibar.Path}" />
 					</controls:OmnibarMode.IconOnActive>
 					<controls:OmnibarMode.IconOnInactive>
-						<controls:ThemedIcon
-							Width="16"
-							Height="16"
-							Style="{StaticResource App.ThemedIcons.Omnibar.Path}" />
+						<controls:ThemedIcon IconColorType="Normal" Style="{StaticResource App.ThemedIcons.Omnibar.Path}" />
 					</controls:OmnibarMode.IconOnInactive>
 				</controls:OmnibarMode>
 				<controls:OmnibarMode
@@ -89,31 +85,23 @@
 					TextPlaceholder="Enter a palette command...">
 					<controls:OmnibarMode.IconOnActive>
 						<controls:ThemedIcon
-							Width="16"
-							Height="16"
+							IconColorType="Normal"
 							IsFilled="True"
 							Style="{StaticResource App.ThemedIcons.Omnibar.Commands}" />
 					</controls:OmnibarMode.IconOnActive>
 					<controls:OmnibarMode.IconOnInactive>
-						<controls:ThemedIcon
-							Width="16"
-							Height="16"
-							Style="{StaticResource App.ThemedIcons.Omnibar.Commands}" />
+						<controls:ThemedIcon IconColorType="Normal" Style="{StaticResource App.ThemedIcons.Omnibar.Commands}" />
 					</controls:OmnibarMode.IconOnInactive>
 				</controls:OmnibarMode>
 				<controls:OmnibarMode Text="Search..." TextPlaceholder="Enter a search query...">
 					<controls:OmnibarMode.IconOnActive>
 						<controls:ThemedIcon
-							Width="16"
-							Height="16"
+							IconColorType="Normal"
 							IsFilled="True"
 							Style="{StaticResource App.ThemedIcons.Omnibar.Search}" />
 					</controls:OmnibarMode.IconOnActive>
 					<controls:OmnibarMode.IconOnInactive>
-						<controls:ThemedIcon
-							Width="16"
-							Height="16"
-							Style="{StaticResource App.ThemedIcons.Omnibar.Search}" />
+						<controls:ThemedIcon IconColorType="Normal" Style="{StaticResource App.ThemedIcons.Omnibar.Search}" />
 					</controls:OmnibarMode.IconOnInactive>
 				</controls:OmnibarMode>
 			</controls:Omnibar>