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

merge fix

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2022-05-12 10:17:29 -06:00
parent 3c0485cfa9
commit 3dd3b710b7
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/LibationWinForms/Form1.cs
View File

@ -26,8 +26,8 @@ namespace LibationWinForms
{ {
InitializeComponent(); InitializeComponent();
splitContainer1.Panel2Collapsed = true; if (this.DesignMode)
processBookQueue1.popoutBtn.Click += ProcessBookQueue1_PopOut; 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);
@ -70,27 +70,9 @@ 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)
{
// suppressed filter while init'ing UI
var prev_isProcessingGridSelect = isProcessingGridSelect;
isProcessingGridSelect = true;
this.UIThreadSync(() => productsGrid.Display());
isProcessingGridSelect = prev_isProcessingGridSelect;
// UI init complete. now we can apply filter
this.UIThreadAsync(() => doFilter(lastGoodFilter));
setBackupCounts();
}
#region bottom: backup counts #region bottom: backup counts
private System.ComponentModel.BackgroundWorker updateCountsBw; private System.ComponentModel.BackgroundWorker updateCountsBw;