mirror/Libation
1
0
Fork 0
mirror of https://github.com/rmcrackan/Libation.git synced 2026-05-09 08:04:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix #1783 : X to clear filter in Chardonnay

Browse Source
This commit is contained in:
rmcrackan
2026-05-04 10:02:18 -04:00
parent b259fdc9a5
commit 0891fcf256
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/LibationAvalonia/Views/MainWindow.axaml
View File

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

10
Source/LibationAvalonia/Views/MainWindow.axaml.cs
View File

@@ -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);