tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fixed where the filter was being called multiple times on launch

Browse Source 
* simplified productsGrid init means a lot of defensive code is no longer needed
This commit is contained in:
Robert McRackan 2022-05-12 10:28:30 -04:00
parent 75c5f662dc
commit 360f077da3
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/LibationWinForms/Form1.cs
View File

@ -28,9 +28,19 @@ namespace LibationWinForms
{ {
InitializeComponent(); InitializeComponent();
if (this.DesignMode)
return;
productsGrid = new ProductsGrid { Dock = DockStyle.Fill }; productsGrid = new ProductsGrid { Dock = DockStyle.Fill };
productsGrid.VisibleCountChanged += (_, qty) => visibleCountLbl.Text = string.Format("Visible: {0}", qty); productsGrid.VisibleCountChanged += (_, qty) => visibleCountLbl.Text = string.Format("Visible: {0}", qty);
gridPanel.Controls.Add(productsGrid); gridPanel.Controls.Add(productsGrid);
this.Load += (_, __) =>
{
productsGrid.Display();
// also applies filter. ONLY call AFTER loading grid
loadInitialQuickFilterState();
};
// back up string formats // back up string formats
beginBookBackupsToolStripMenuItem_format = beginBookBackupsToolStripMenuItem.Text; beginBookBackupsToolStripMenuItem_format = beginBookBackupsToolStripMenuItem.Text;
@ -39,13 +49,11 @@ namespace LibationWinForms
liberateVisibleToolStripMenuItem_format = liberateVisibleToolStripMenuItem.Text; liberateVisibleToolStripMenuItem_format = liberateVisibleToolStripMenuItem.Text;
liberateVisible2ToolStripMenuItem_format = liberateVisible2ToolStripMenuItem.Text; liberateVisible2ToolStripMenuItem_format = liberateVisible2ToolStripMenuItem.Text;
if (this.DesignMode)
return;
// independent UI updates // independent UI updates
this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance); this.Load += (_, _) => this.RestoreSizeAndLocation(Configuration.Instance);
this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance); this.FormClosing += (_, _) => this.SaveSizeAndLocation(Configuration.Instance);
LibraryCommands.LibrarySizeChanged += reloadGridAndUpdateBottomNumbers; LibraryCommands.LibrarySizeChanged += reloadGridAndUpdateBottomNumbers;
this.Load += setBackupCounts;
LibraryCommands.BookUserDefinedItemCommitted += setBackupCounts; LibraryCommands.BookUserDefinedItemCommitted += setBackupCounts;
QuickFilters.Updated += updateFiltersMenu; QuickFilters.Updated += updateFiltersMenu;
LibraryCommands.ScanBegin += LibraryCommands_ScanBegin; LibraryCommands.ScanBegin += LibraryCommands_ScanBegin;
@ -71,21 +79,12 @@ namespace LibationWinForms
if (this.DesignMode) if (this.DesignMode)
return; return;
// can't refactor into "this.Load => reloadGridAndUpdateBottomNumbers" // I'm leaving this empty call here as a reminder that if we use this, it should probably be after DesignMode check
// because loadInitialQuickFilterState must follow it
reloadGridAndUpdateBottomNumbers();
// also applies filter. ONLY call AFTER loading grid
loadInitialQuickFilterState();
} }
private void reloadGridAndUpdateBottomNumbers(object _ = null, object __ = null) private void reloadGridAndUpdateBottomNumbers(object _, object __)
{ {
// suppressed filter while init'ing UI
var prev_isProcessingGridSelect = isProcessingGridSelect;
isProcessingGridSelect = true;
this.UIThreadSync(() => productsGrid.Display()); this.UIThreadSync(() => productsGrid.Display());
isProcessingGridSelect = prev_isProcessingGridSelect;
// UI init complete. now we can apply filter // UI init complete. now we can apply filter
this.UIThreadAsync(() => doFilter(lastGoodFilter)); this.UIThreadAsync(() => doFilter(lastGoodFilter));
@ -198,7 +197,6 @@ namespace LibationWinForms
} }
private void filterBtn_Click(object sender, EventArgs e) => doFilter(); private void filterBtn_Click(object sender, EventArgs e) => doFilter();
private bool isProcessingGridSelect = false;
private string lastGoodFilter = ""; private string lastGoodFilter = "";
private void doFilter(string filterString) private void doFilter(string filterString)
{ {
@ -207,9 +205,6 @@ namespace LibationWinForms
} }
private void doFilter() private void doFilter()
{ {
if (isProcessingGridSelect || productsGrid is null)
return;
try try
{ {
productsGrid.Filter(filterSearchTb.Text); productsGrid.Filter(filterSearchTb.Text);