From 0891fcf256c6825633af000ff7da47ab644bd360 Mon Sep 17 00:00:00 2001
From: rmcrackan <rmcrackan@gmail.com>
Date: Mon, 4 May 2026 10:02:18 -0400
Subject: [PATCH] Bug fix #1783 : X to clear filter in Chardonnay

---
 .../LibationAvalonia/Views/MainWindow.axaml   | 25 ++++++++++++++++++-
 .../Views/MainWindow.axaml.cs                 | 10 ++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/Source/LibationAvalonia/Views/MainWindow.axaml b/Source/LibationAvalonia/Views/MainWindow.axaml
index 4221422d..8447b0e8 100644
--- a/Source/LibationAvalonia/Views/MainWindow.axaml
+++ b/Source/LibationAvalonia/Views/MainWindow.axaml
@@ -192,7 +192,30 @@
 				<Button IsVisible="{CompiledBinding RemoveButtonsVisible}" Command="{CompiledBinding DoneRemovingBtn}" Content="Done Removing Books"/>
 			</StackPanel>
 				
-			<TextBox Grid.Column="1" Margin="10,0,0,0" Name="filterSearchTb" IsVisible="{CompiledBinding !RemoveButtonsVisible}" Text="{CompiledBinding SelectedNamedFilter.Filter, Mode=OneWay}" KeyDown="filterSearchTb_KeyPress" />
+			<Grid
+				Grid.Column="1"
+				Margin="10,0,0,0"
+				ColumnDefinitions="*,Auto"
+				IsVisible="{CompiledBinding !RemoveButtonsVisible}">
+				<TextBox
+					Grid.Column="0"
+					Name="filterSearchTb"
+					VerticalAlignment="Stretch"
+					InnerRightContent="{x:Null}"
+					ScrollViewer.HorizontalScrollBarVisibility="Auto"
+					ScrollViewer.VerticalScrollBarVisibility="Disabled"
+					Text="{CompiledBinding SelectedNamedFilter.Filter, Mode=OneWay}"
+					KeyDown="filterSearchTb_KeyPress" />
+				<Button
+					Grid.Column="1"
+					Margin="6,0,0,0"
+					Padding="10,4"
+					VerticalAlignment="Stretch"
+					VerticalContentAlignment="Center"
+					Click="ClearFilterButton_Click"
+					Content="×"
+					ToolTip.Tip="Clear filter" />
+			</Grid>
 
 			<StackPanel Grid.Column="2" Height="30" Orientation="Horizontal">
 				<Button Name="filterBtn" Command="{CompiledBinding FilterBtn}" CommandParameter="{CompiledBinding #filterSearchTb.Text}" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Filter"/>
diff --git a/Source/LibationAvalonia/Views/MainWindow.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.axaml.cs
index e0fd589e..60622557 100644
--- a/Source/LibationAvalonia/Views/MainWindow.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow.axaml.cs
@@ -205,6 +205,16 @@ public partial class MainWindow : ReactiveWindow<MainVM>
 		}
 	}
 
+	private async void ClearFilterButton_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+	{
+		if (ViewModel is null)
+			return;
+		await ViewModel.FilterBtn(string.Empty);
+		// Typed text lives only in the TextBox (OneWay binding). If the VM filter was already empty,
+		// PerformFilter does not refresh the binding, so clear the control explicitly (WinForms sets Text in performFilter).
+		filterSearchTb.Text = string.Empty;
+	}
+
 	private void Configure_Upgrade()
 	{
 		setProgressVisible(false);