make axaml toggle thing also

mohnjiles · mohnjiles · commit 0915ffba1ea7 · 2026-02-12T19:37:27.000-08:00
diff --git a/StabilityMatrix.Avalonia/Controls/BetterComboBox.cs b/StabilityMatrix.Avalonia/Controls/BetterComboBox.cs
@@ -27,10 +27,10 @@ public class BetterComboBox : ComboBox
         BetterComboBox,
         string
     >(nameof(SearchWatermark), defaultValue: "Search...");
-    public static readonly StyledProperty<bool> UseLegacyModelSearchProperty = AvaloniaProperty.Register<
+    public static readonly StyledProperty<bool> UseLegacySearchProperty = AvaloniaProperty.Register<
         BetterComboBox,
         bool
-    >(nameof(UseLegacyModelSearch));
+    >(nameof(UseLegacySearch));
     public static readonly DirectProperty<BetterComboBox, string> SearchTextProperty =
         AvaloniaProperty.RegisterDirect<BetterComboBox, string>(nameof(SearchText), o => o.SearchText);
 
@@ -40,10 +40,10 @@ public string SearchWatermark
         set => SetValue(SearchWatermarkProperty, value);
     }
 
-    public bool UseLegacyModelSearch
+    public bool UseLegacySearch
     {
-        get => GetValue(UseLegacyModelSearchProperty);
-        set => SetValue(UseLegacyModelSearchProperty, value);
+        get => GetValue(UseLegacySearchProperty);
+        set => SetValue(UseLegacySearchProperty, value);
     }
 
     public string SearchText
@@ -104,7 +104,7 @@ public BetterComboBox()
             settingsManager = App.Services.GetService<ISettingsManager>();
             if (settingsManager is not null)
             {
-                UseLegacyModelSearch = settingsManager.Settings.UseLegacyModelSearch;
+                ApplyGlobalLegacySearchOverride(settingsManager.Settings.UseLegacySearch);
                 settingsManager.SettingsPropertyChanged += OnSettingsPropertyChanged;
             }
         }
@@ -160,7 +160,7 @@ protected override void OnTextInput(TextInputEventArgs e)
             if (IsDropDownOpen)
             {
                 UpdateSearchTextBoxText(keyboardSearchText);
-                if (!UseLegacyModelSearch)
+                if (!UseLegacySearch)
                 {
                     Dispatcher.UIThread.Post(() => searchTextBox?.Focus(), DispatcherPriority.Input);
                 }
@@ -199,7 +199,7 @@ private void OnDropDownOpened(object? sender, EventArgs e)
         StopLegacySearchResetTimer();
         ResetSearchText();
         ApplyFilter(string.Empty);
-        if (!UseLegacyModelSearch)
+        if (!UseLegacySearch)
         {
             Dispatcher.UIThread.Post(() => searchTextBox?.Focus(), DispatcherPriority.Input);
         }
@@ -235,7 +235,7 @@ private void ResetSearchText()
 
     private void RestartLegacySearchResetTimer()
     {
-        if (!UseLegacyModelSearch || string.IsNullOrEmpty(keyboardSearchText))
+        if (!UseLegacySearch || string.IsNullOrEmpty(keyboardSearchText))
             return;
 
         legacySearchResetTimer.Stop();
@@ -249,7 +249,7 @@ private void StopLegacySearchResetTimer()
 
     private void UpdateLegacySearchPopupText(string text)
     {
-        if (!UseLegacyModelSearch || string.IsNullOrWhiteSpace(text))
+        if (!UseLegacySearch || string.IsNullOrWhiteSpace(text))
         {
             HideLegacySearchPopup();
             return;
@@ -278,7 +278,7 @@ private void OnLegacySearchResetTimerTick(object? sender, EventArgs e)
     {
         legacySearchResetTimer.Stop();
 
-        if (!UseLegacyModelSearch || string.IsNullOrWhiteSpace(keyboardSearchText))
+        if (!UseLegacySearch || string.IsNullOrWhiteSpace(keyboardSearchText))
             return;
 
         ResetSearchText();
@@ -288,7 +288,7 @@ private void OnInputReceived(string input)
     {
         if (IsDropDownOpen)
         {
-            if (UseLegacyModelSearch)
+            if (UseLegacySearch)
             {
                 var query = input.Trim();
                 if (string.IsNullOrWhiteSpace(query))
@@ -320,7 +320,7 @@ private void OnInputReceived(string input)
             return;
         }
 
-        if (UseLegacyModelSearch)
+        if (UseLegacySearch)
         {
             var legacyMatch = FindLegacyMatch(input);
             if (legacyMatch is null)
@@ -393,9 +393,9 @@ private void ApplyFilter(string input)
 
     private bool IsItemMatch(object item, string query)
     {
-        var itemText = GetItemSearchText(item, UseLegacyModelSearch);
+        var itemText = GetItemSearchText(item, UseLegacySearch);
 
-        if (UseLegacyModelSearch)
+        if (UseLegacySearch)
         {
             return itemText.Contains(query, StringComparison.OrdinalIgnoreCase);
         }
@@ -475,7 +475,7 @@ Func<TItem, string> getSearchText
 
     private void OnContainerPrepared(object? sender, ContainerPreparedEventArgs e)
     {
-        if (!IsDropDownOpen || UseLegacyModelSearch)
+        if (!IsDropDownOpen || UseLegacySearch)
             return;
 
         var query = keyboardSearchText.Trim();
@@ -493,7 +493,7 @@ private void OnContainerPrepared(object? sender, ContainerPreparedEventArgs e)
 
     private void OnContainerIndexChanged(object? sender, ContainerIndexChangedEventArgs e)
     {
-        if (!IsDropDownOpen || UseLegacyModelSearch)
+        if (!IsDropDownOpen || UseLegacySearch)
             return;
 
         var query = keyboardSearchText.Trim();
@@ -518,22 +518,34 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
             searchCache.Clear();
         }
 
-        if (change.Property == UseLegacyModelSearchProperty && !UseLegacyModelSearch)
+        if (change.Property == UseLegacySearchProperty && !UseLegacySearch)
         {
             StopLegacySearchResetTimer();
             HideLegacySearchPopup();
         }
     }
 
+    private void ApplyGlobalLegacySearchOverride(bool globalOverride)
+    {
+        if (globalOverride)
+        {
+            SetValue(UseLegacySearchProperty, true);
+        }
+        else
+        {
+            ClearValue(UseLegacySearchProperty);
+        }
+    }
+
     private void OnSettingsPropertyChanged(object? sender, RelayPropertyChangedEventArgs e)
     {
-        if (e.PropertyName != nameof(Settings.UseLegacyModelSearch) || settingsManager is null)
+        if (e.PropertyName != nameof(Settings.UseLegacySearch) || settingsManager is null)
             return;
 
         Dispatcher.UIThread.Post(() =>
         {
-            UseLegacyModelSearch = settingsManager.Settings.UseLegacyModelSearch;
-            if (!UseLegacyModelSearch)
+            ApplyGlobalLegacySearchOverride(settingsManager.Settings.UseLegacySearch);
+            if (!UseLegacySearch)
             {
                 StopLegacySearchResetTimer();
                 HideLegacySearchPopup();
diff --git a/StabilityMatrix.Avalonia/Controls/Inference/SamplerCard.axaml b/StabilityMatrix.Avalonia/Controls/Inference/SamplerCard.axaml
@@ -46,7 +46,8 @@
                                 DisplayMemberBinding="{Binding DisplayName}"
                                 IsVisible="{Binding IsSamplerSelectionEnabled}"
                                 ItemsSource="{Binding ClientManager.Samplers}"
-                                SelectedItem="{Binding SelectedSampler}" />
+                                SelectedItem="{Binding SelectedSampler}"
+                                UseLegacySearch="True" />
                             <!--  Scheduler  -->
                             <TextBlock
                                 Grid.Row="1"
@@ -63,7 +64,8 @@
                                 DisplayMemberBinding="{Binding DisplayName}"
                                 IsVisible="{Binding IsSchedulerSelectionEnabled}"
                                 ItemsSource="{Binding ClientManager.Schedulers}"
-                                SelectedItem="{Binding SelectedScheduler}" />
+                                SelectedItem="{Binding SelectedScheduler}"
+                                UseLegacySearch="True" />
 
                             <TextBlock
                                 Grid.Row="2"
diff --git a/StabilityMatrix.Avalonia/Services/NotificationService.cs b/StabilityMatrix.Avalonia/Services/NotificationService.cs
@@ -45,7 +45,14 @@ public void Initialize(
 
     public void Show(INotification notification)
     {
-        notificationManager?.Show(notification);
+        if (Dispatcher.UIThread.CheckAccess())
+        {
+            notificationManager?.Show(notification);
+        }
+        else
+        {
+            Dispatcher.UIThread.Post(() => notificationManager?.Show(notification));
+        }
     }
 
     /// <inheritdoc />
diff --git a/StabilityMatrix.Avalonia/Styles/ControlThemes/BetterComboBoxStyles.axaml b/StabilityMatrix.Avalonia/Styles/ControlThemes/BetterComboBoxStyles.axaml
@@ -310,7 +310,7 @@
             </Style>
         </Style>
 
-        <Style Selector="^[UseLegacyModelSearch=true] /template/ TextBox#PART_SearchTextBox">
+        <Style Selector="^[UseLegacySearch=true] /template/ TextBox#PART_SearchTextBox">
             <Setter Property="IsVisible" Value="False" />
             <Setter Property="Margin" Value="0" />
             <Setter Property="MinHeight" Value="0" />
diff --git a/StabilityMatrix.Avalonia/ViewModels/Settings/InferenceSettingsViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Settings/InferenceSettingsViewModel.cs
@@ -70,7 +70,7 @@ public partial class InferenceSettingsViewModel : PageViewModelBase
     private bool filterExtraNetworksByBaseModel;
 
     [ObservableProperty]
-    private bool useLegacyModelSearch;
+    private bool useLegacySearch;
 
     private List<string> ignoredFileNameFormatVars =
     [
@@ -152,8 +152,8 @@ ISettingsManager settingsManager
 
         settingsManager.RelayPropertyFor(
             this,
-            vm => vm.UseLegacyModelSearch,
-            settings => settings.UseLegacyModelSearch,
+            vm => vm.UseLegacySearch,
+            settings => settings.UseLegacySearch,
             true
         );
 
diff --git a/StabilityMatrix.Avalonia/Views/Settings/InferenceSettingsPage.axaml b/StabilityMatrix.Avalonia/Views/Settings/InferenceSettingsPage.axaml
@@ -169,13 +169,13 @@
 
                 <ui:SettingsExpander
                     Grid.Row="4"
-                    Description="Use the previous combo box model search behavior (floating typed text and auto-select first match)."
-                    Header="Legacy Model Search">
+                    Description="Force all combo boxes to use floating search (floating typed text, auto-select first match). When off, each combo box uses its own configured search mode."
+                    Header="Use Floating Search">
                     <ui:SettingsExpander.IconSource>
                         <controls:FASymbolIconSource Symbol="fa-solid fa-magnifying-glass" />
                     </ui:SettingsExpander.IconSource>
                     <ui:SettingsExpander.Footer>
-                        <ToggleSwitch IsChecked="{Binding UseLegacyModelSearch}" />
+                        <ToggleSwitch IsChecked="{Binding UseLegacySearch}" />
                     </ui:SettingsExpander.Footer>
                 </ui:SettingsExpander>
 
diff --git a/StabilityMatrix.Core/Models/Settings/Settings.cs b/StabilityMatrix.Core/Models/Settings/Settings.cs
@@ -205,7 +205,9 @@ public IReadOnlyDictionary<string, string> EnvironmentVariables
     public bool SortConnectedModelsFirst { get; set; } = true;
     public int ConsoleFontSize { get; set; } = 14;
     public bool AutoLoadCivitModels { get; set; } = true;
-    public bool UseLegacyModelSearch { get; set; }
+
+    [JsonPropertyName("UseLegacyModelSearch")]
+    public bool UseLegacySearch { get; set; }
 
     /// <summary>
     /// When false, will copy files when drag/drop import happens

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,10 @@ public class BetterComboBox : ComboBox`
`27`	`27`	`BetterComboBox,`
`28`	`28`	`string`
`29`	`29`	`>(nameof(SearchWatermark), defaultValue: "Search...");`
`30`		`- public static readonly StyledProperty<bool> UseLegacyModelSearchProperty = AvaloniaProperty.Register<`
	`30`	`+ public static readonly StyledProperty<bool> UseLegacySearchProperty = AvaloniaProperty.Register<`
`31`	`31`	`BetterComboBox,`
`32`	`32`	`bool`
`33`		`- >(nameof(UseLegacyModelSearch));`
	`33`	`+ >(nameof(UseLegacySearch));`
`34`	`34`	`public static readonly DirectProperty<BetterComboBox, string> SearchTextProperty =`
`35`	`35`	`AvaloniaProperty.RegisterDirect<BetterComboBox, string>(nameof(SearchText), o => o.SearchText);`
`36`	`36`
`@@ -40,10 +40,10 @@ public string SearchWatermark`
`40`	`40`	`set => SetValue(SearchWatermarkProperty, value);`
`41`	`41`	`}`
`42`	`42`
`43`		`- public bool UseLegacyModelSearch`
	`43`	`+ public bool UseLegacySearch`
`44`	`44`	`{`
`45`		`- get => GetValue(UseLegacyModelSearchProperty);`
`46`		`- set => SetValue(UseLegacyModelSearchProperty, value);`
	`45`	`+ get => GetValue(UseLegacySearchProperty);`
	`46`	`+ set => SetValue(UseLegacySearchProperty, value);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public string SearchText`
`@@ -104,7 +104,7 @@ public BetterComboBox()`
`104`	`104`	`settingsManager = App.Services.GetService<ISettingsManager>();`
`105`	`105`	`if (settingsManager is not null)`
`106`	`106`	`{`
`107`		`- UseLegacyModelSearch = settingsManager.Settings.UseLegacyModelSearch;`
	`107`	`+ ApplyGlobalLegacySearchOverride(settingsManager.Settings.UseLegacySearch);`
`108`	`108`	`settingsManager.SettingsPropertyChanged += OnSettingsPropertyChanged;`
`109`	`109`	`}`
`110`	`110`	`}`
`@@ -160,7 +160,7 @@ protected override void OnTextInput(TextInputEventArgs e)`
`160`	`160`	`if (IsDropDownOpen)`
`161`	`161`	`{`
`162`	`162`	`UpdateSearchTextBoxText(keyboardSearchText);`
`163`		`- if (!UseLegacyModelSearch)`
	`163`	`+ if (!UseLegacySearch)`
`164`	`164`	`{`
`165`	`165`	`Dispatcher.UIThread.Post(() => searchTextBox?.Focus(), DispatcherPriority.Input);`
`166`	`166`	`}`
`@@ -199,7 +199,7 @@ private void OnDropDownOpened(object? sender, EventArgs e)`
`199`	`199`	`StopLegacySearchResetTimer();`
`200`	`200`	`ResetSearchText();`
`201`	`201`	`ApplyFilter(string.Empty);`
`202`		`- if (!UseLegacyModelSearch)`
	`202`	`+ if (!UseLegacySearch)`
`203`	`203`	`{`
`204`	`204`	`Dispatcher.UIThread.Post(() => searchTextBox?.Focus(), DispatcherPriority.Input);`
`205`	`205`	`}`
`@@ -235,7 +235,7 @@ private void ResetSearchText()`
`235`	`235`
`236`	`236`	`private void RestartLegacySearchResetTimer()`
`237`	`237`	`{`
`238`		`- if (!UseLegacyModelSearch \|\| string.IsNullOrEmpty(keyboardSearchText))`
	`238`	`+ if (!UseLegacySearch \|\| string.IsNullOrEmpty(keyboardSearchText))`
`239`	`239`	`return;`
`240`	`240`
`241`	`241`	`legacySearchResetTimer.Stop();`
`@@ -249,7 +249,7 @@ private void StopLegacySearchResetTimer()`
`249`	`249`
`250`	`250`	`private void UpdateLegacySearchPopupText(string text)`
`251`	`251`	`{`
`252`		`- if (!UseLegacyModelSearch \|\| string.IsNullOrWhiteSpace(text))`
	`252`	`+ if (!UseLegacySearch \|\| string.IsNullOrWhiteSpace(text))`
`253`	`253`	`{`
`254`	`254`	`HideLegacySearchPopup();`
`255`	`255`	`return;`
`@@ -278,7 +278,7 @@ private void OnLegacySearchResetTimerTick(object? sender, EventArgs e)`
`278`	`278`	`{`
`279`	`279`	`legacySearchResetTimer.Stop();`
`280`	`280`
`281`		`- if (!UseLegacyModelSearch \|\| string.IsNullOrWhiteSpace(keyboardSearchText))`
	`281`	`+ if (!UseLegacySearch \|\| string.IsNullOrWhiteSpace(keyboardSearchText))`
`282`	`282`	`return;`
`283`	`283`
`284`	`284`	`ResetSearchText();`
`@@ -288,7 +288,7 @@ private void OnInputReceived(string input)`
`288`	`288`	`{`
`289`	`289`	`if (IsDropDownOpen)`
`290`	`290`	`{`
`291`		`- if (UseLegacyModelSearch)`
	`291`	`+ if (UseLegacySearch)`
`292`	`292`	`{`
`293`	`293`	`var query = input.Trim();`
`294`	`294`	`if (string.IsNullOrWhiteSpace(query))`
`@@ -320,7 +320,7 @@ private void OnInputReceived(string input)`
`320`	`320`	`return;`
`321`	`321`	`}`
`322`	`322`
`323`		`- if (UseLegacyModelSearch)`
	`323`	`+ if (UseLegacySearch)`
`324`	`324`	`{`
`325`	`325`	`var legacyMatch = FindLegacyMatch(input);`
`326`	`326`	`if (legacyMatch is null)`
`@@ -393,9 +393,9 @@ private void ApplyFilter(string input)`
`393`	`393`
`394`	`394`	`private bool IsItemMatch(object item, string query)`
`395`	`395`	`{`
`396`		`- var itemText = GetItemSearchText(item, UseLegacyModelSearch);`
	`396`	`+ var itemText = GetItemSearchText(item, UseLegacySearch);`
`397`	`397`
`398`		`- if (UseLegacyModelSearch)`
	`398`	`+ if (UseLegacySearch)`
`399`	`399`	`{`
`400`	`400`	`return itemText.Contains(query, StringComparison.OrdinalIgnoreCase);`
`401`	`401`	`}`
`@@ -475,7 +475,7 @@ Func<TItem, string> getSearchText`
`475`	`475`
`476`	`476`	`private void OnContainerPrepared(object? sender, ContainerPreparedEventArgs e)`
`477`	`477`	`{`
`478`		`- if (!IsDropDownOpen \|\| UseLegacyModelSearch)`
	`478`	`+ if (!IsDropDownOpen \|\| UseLegacySearch)`
`479`	`479`	`return;`
`480`	`480`
`481`	`481`	`var query = keyboardSearchText.Trim();`
`@@ -493,7 +493,7 @@ private void OnContainerPrepared(object? sender, ContainerPreparedEventArgs e)`
`493`	`493`
`494`	`494`	`private void OnContainerIndexChanged(object? sender, ContainerIndexChangedEventArgs e)`
`495`	`495`	`{`
`496`		`- if (!IsDropDownOpen \|\| UseLegacyModelSearch)`
	`496`	`+ if (!IsDropDownOpen \|\| UseLegacySearch)`
`497`	`497`	`return;`
`498`	`498`
`499`	`499`	`var query = keyboardSearchText.Trim();`
`@@ -518,22 +518,34 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang`
`518`	`518`	`searchCache.Clear();`
`519`	`519`	`}`
`520`	`520`
`521`		`- if (change.Property == UseLegacyModelSearchProperty && !UseLegacyModelSearch)`
	`521`	`+ if (change.Property == UseLegacySearchProperty && !UseLegacySearch)`
`522`	`522`	`{`
`523`	`523`	`StopLegacySearchResetTimer();`
`524`	`524`	`HideLegacySearchPopup();`
`525`	`525`	`}`
`526`	`526`	`}`
`527`	`527`
	`528`	`+ private void ApplyGlobalLegacySearchOverride(bool globalOverride)`
	`529`	`+ {`
	`530`	`+ if (globalOverride)`
	`531`	`+ {`
	`532`	`+ SetValue(UseLegacySearchProperty, true);`
	`533`	`+ }`
	`534`	`+ else`
	`535`	`+ {`
	`536`	`+ ClearValue(UseLegacySearchProperty);`
	`537`	`+ }`
	`538`	`+ }`
	`539`	`+`
`528`	`540`	`private void OnSettingsPropertyChanged(object? sender, RelayPropertyChangedEventArgs e)`
`529`	`541`	`{`
`530`		`- if (e.PropertyName != nameof(Settings.UseLegacyModelSearch) \|\| settingsManager is null)`
	`542`	`+ if (e.PropertyName != nameof(Settings.UseLegacySearch) \|\| settingsManager is null)`
`531`	`543`	`return;`
`532`	`544`
`533`	`545`	`Dispatcher.UIThread.Post(() =>`
`534`	`546`	`{`
`535`		`- UseLegacyModelSearch = settingsManager.Settings.UseLegacyModelSearch;`
`536`		`- if (!UseLegacyModelSearch)`
	`547`	`+ ApplyGlobalLegacySearchOverride(settingsManager.Settings.UseLegacySearch);`
	`548`	`+ if (!UseLegacySearch)`
`537`	`549`	`{`
`538`	`550`	`StopLegacySearchResetTimer();`
`539`	`551`	`HideLegacySearchPopup();`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,14 @@ public void Initialize(`
`45`	`45`
`46`	`46`	`public void Show(INotification notification)`
`47`	`47`	`{`
`48`		`- notificationManager?.Show(notification);`
	`48`	`+ if (Dispatcher.UIThread.CheckAccess())`
	`49`	`+ {`
	`50`	`+ notificationManager?.Show(notification);`
	`51`	`+ }`
	`52`	`+ else`
	`53`	`+ {`
	`54`	`+ Dispatcher.UIThread.Post(() => notificationManager?.Show(notification));`
	`55`	`+ }`
`49`	`56`	`}`
`50`	`57`
`51`	`58`	`/// <inheritdoc />`