Added UseDefaultInactiveMode

Author: 0x5bfa

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

@@ -19,5 +19,8 @@ public partial class Omnibar
 
 		[GeneratedDependencyProperty]
 		public partial OmnibarMode? CurrentActiveMode { get; set; }
+
+		[GeneratedDependencyProperty]
+		public partial object? DefaultInactiveMode { get; set; }
 	}
 }

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

@@ -104,13 +104,11 @@ internal void ChangeExpandedMode(OmnibarMode modeToExpand)
 				column.Width = GridLength.Auto;
 			foreach (var mode in Modes)
 			{
-				VisualStateManager.GoToState(mode, "InactiveIcon", true);
-				VisualStateManager.GoToState(mode, "Collapsed", true);
+				VisualStateManager.GoToState(mode, "Unfocused", true);
 			}
 
 			// Expand the given mode
-			VisualStateManager.GoToState(modeToExpand, "ActiveIcon", true);
-			VisualStateManager.GoToState(modeToExpand, "Visible", true);
+			VisualStateManager.GoToState(modeToExpand, "Focused", true);
 			_modesHostGrid.ColumnDefinitions[_modesHostGrid.Children.IndexOf(modeToExpand)].Width = new(1, GridUnitType.Star);
 
 			CurrentActiveMode = modeToExpand;

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

@@ -24,7 +24,7 @@ public partial class OmnibarMode
 		public partial string? ToolTip { get; set; }
 
 		[GeneratedDependencyProperty]
-		public partial bool HideContentOnInactive { get; set; }
+		public partial bool UseDefaultInactiveMode { get; set; }
 
 		[GeneratedDependencyProperty]
 		public partial FrameworkElement? IconOnActive { get; set; }

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

@@ -93,20 +93,17 @@
 								</VisualState>
 							</VisualStateGroup>
 
-							<VisualStateGroup x:Name="InputVisibilityStates">
-								<VisualState x:Name="Collapsed" />
-								<VisualState x:Name="Visible">
+							<VisualStateGroup x:Name="FocusStates">
+								<VisualState x:Name="Unfocused" />
+								<VisualState x:Name="CurretUnfocused">
 									<VisualState.Setters>
 										<Setter Target="PART_InputTextBox.Visibility" Value="Visible" />
 									</VisualState.Setters>
 								</VisualState>
-							</VisualStateGroup>
-
-							<VisualStateGroup x:Name="IconStates">
-								<VisualState x:Name="InactiveIcon" />
-								<VisualState x:Name="ActiveIcon">
+								<VisualState x:Name="Focused">
 									<VisualState.Setters>
 										<Setter Target="PART_ModeIconPresenter.Content" Value="{Binding IconOnActive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+										<Setter Target="PART_InputTextBox.Visibility" Value="Visible" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>

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

@@ -66,13 +66,19 @@
 			Style="{StaticResource GridExampleControlStyle}">
 			<controls:Omnibar HorizontalAlignment="Stretch" VerticalAlignment="Center">
 
+				<controls:Omnibar.DefaultInactiveMode>
+					<Grid>
+						<TextBlock Text="A" />
+					</Grid>
+				</controls:Omnibar.DefaultInactiveMode>
+
 				<controls:OmnibarMode
-					HideContentOnInactive="True"
 					IsDefault="True"
 					SuggestionItemsSource="{x:Bind DummyItems1, Mode=OneWay}"
 					Text="Path..."
 					TextPlaceholder="Enter text..."
-					ToolTip="Path">
+					ToolTip="Path"
+					UseDefaultInactiveMode="True">
 					<controls:OmnibarMode.IconOnActive>
 						<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Path}" />
 					</controls:OmnibarMode.IconOnActive>
@@ -87,10 +93,10 @@
 				</controls:OmnibarMode>
 
 				<controls:OmnibarMode
-					HideContentOnInactive="True"
 					Text="Palette..."
 					TextPlaceholder="Enter a palette command..."
-					ToolTip="Palette">
+					ToolTip="Palette"
+					UseDefaultInactiveMode="True">
 					<controls:OmnibarMode.IconOnActive>
 						<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Commands}" />
 					</controls:OmnibarMode.IconOnActive>