Fix ordering of FormStateController interactions

cyanfish · Sep 8, 2024 · 104c7f4 · 104c7f4
1 parent 6d3a563
commit 104c7f4
Show file tree

Hide file tree

Showing 32 changed files with 47 additions and 4 deletions.
diff --git a/NAPS2.Lib/EtoForms/EtoDialogBase.cs b/NAPS2.Lib/EtoForms/EtoDialogBase.cs
@@ -23,12 +23,18 @@ protected EtoDialogBase(Naps2Config config)
         EtoPlatform.Current.InitForm(this);
     }
 
-    protected abstract void BuildLayout();
+    protected virtual void BuildLayout()
+    {
+        FormStateController.LoadState();
+    }
 
     protected override void OnPreLoad(EventArgs e)
     {
-        FormStateController.LoadState();
         BuildLayout();
+        if (!FormStateController.Loaded)
+        {
+            throw new InvalidOperationException("Base BuildLayout method not called");
+        }
         base.OnPreLoad(e);
     }
 

diff --git a/NAPS2.Lib/EtoForms/EtoFormBase.cs b/NAPS2.Lib/EtoForms/EtoFormBase.cs
@@ -17,12 +17,18 @@ protected EtoFormBase(Naps2Config config)
         EtoPlatform.Current.InitForm(this);
     }
 
-    protected abstract void BuildLayout();
+    protected virtual void BuildLayout()
+    {
+        FormStateController.LoadState();
+    }
 
     protected override void OnPreLoad(EventArgs e)
     {
-        FormStateController.LoadState();
         BuildLayout();
+        if (!FormStateController.Loaded)
+        {
+            throw new InvalidOperationException("Base BuildLayout method not called");
+        }
         base.OnPreLoad(e);
     }
 

diff --git a/NAPS2.Lib/EtoForms/Ui/AboutForm.cs b/NAPS2.Lib/EtoForms/Ui/AboutForm.cs
@@ -40,6 +40,7 @@ protected override void BuildLayout()
     {
         FormStateController.Resizable = false;
         FormStateController.RestoreFormState = false;
+        base.BuildLayout();
 
         LayoutController.DefaultSpacing = 2;
         LayoutController.Content = L.Row(

diff --git a/NAPS2.Lib/EtoForms/Ui/AdvancedProfileForm.cs b/NAPS2.Lib/EtoForms/Ui/AdvancedProfileForm.cs
@@ -63,6 +63,7 @@ protected override void BuildLayout()
 
         FormStateController.DefaultExtraLayoutSize = new Size(60, 0);
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             L.GroupBox(

diff --git a/NAPS2.Lib/EtoForms/Ui/AuthorizeForm.cs b/NAPS2.Lib/EtoForms/Ui/AuthorizeForm.cs
@@ -23,6 +23,7 @@ protected override void BuildLayout()
         FormStateController.FixedHeightLayout = true;
         FormStateController.RestoreFormState = false;
         FormStateController.Resizable = false;
+        base.BuildLayout();
 
         LayoutController.Content = L.Row(
             C.Label(UiStrings.WaitingForAuthorization).Padding(right: 30),

diff --git a/NAPS2.Lib/EtoForms/Ui/AutoSaveSettingsForm.cs b/NAPS2.Lib/EtoForms/Ui/AutoSaveSettingsForm.cs
@@ -54,6 +54,7 @@ protected override void BuildLayout()
         Title = UiStrings.AutoSaveSettingsFormTitle;
 
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             C.Label(UiStrings.FilePathLabel).NaturalWidth(300),

diff --git a/NAPS2.Lib/EtoForms/Ui/BatchPromptForm.cs b/NAPS2.Lib/EtoForms/Ui/BatchPromptForm.cs
@@ -33,6 +33,7 @@ protected override void BuildLayout()
         FormStateController.SaveFormState = false;
         FormStateController.RestoreFormState = false;
         FormStateController.Resizable = false;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             C.Label(string.Format(UiStrings.ReadyForScan, ScanNumber)).NaturalWidth(200),

diff --git a/NAPS2.Lib/EtoForms/Ui/BatchScanForm.cs b/NAPS2.Lib/EtoForms/Ui/BatchScanForm.cs
@@ -109,6 +109,7 @@ protected override void BuildLayout()
 
         FormStateController.FixedHeightLayout = true;
         AbortButton = _cancel;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             L.Row(

diff --git a/NAPS2.Lib/EtoForms/Ui/ChooseDeviceForm.cs b/NAPS2.Lib/EtoForms/Ui/ChooseDeviceForm.cs
@@ -151,6 +151,7 @@ protected override void BuildLayout()
 
         FormStateController.SaveFormState = FormStateController.RestoreFormState = true;
         FormStateController.DefaultExtraLayoutSize = new Size(150, 100);
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             L.Row(

diff --git a/NAPS2.Lib/EtoForms/Ui/DesktopForm.cs b/NAPS2.Lib/EtoForms/Ui/DesktopForm.cs
@@ -120,6 +120,7 @@ protected override void BuildLayout()
         FormStateController.AutoLayoutSize = false;
         FormStateController.DefaultClientSize = new Size(1210, 600);
         MinimumSize = new Size(600, 300);
+        base.BuildLayout();
 
         LayoutController.RootPadding = 0;
         LayoutController.Content = L.LeftPanel(

diff --git a/NAPS2.Lib/EtoForms/Ui/DownloadProgressForm.cs b/NAPS2.Lib/EtoForms/Ui/DownloadProgressForm.cs
@@ -37,6 +37,7 @@ private void OnDownloadError(object? sender, EventArgs e)
     protected override void BuildLayout()
     {
         FormStateController.RestoreFormState = false;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             _totalStatus,

diff --git a/NAPS2.Lib/EtoForms/Ui/EditProfileForm.cs b/NAPS2.Lib/EtoForms/Ui/EditProfileForm.cs
@@ -91,6 +91,7 @@ protected override void BuildLayout()
     {
         FormStateController.DefaultExtraLayoutSize = new Size(60, 0);
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             C.Label(UiStrings.DisplayNameLabel),

diff --git a/NAPS2.Lib/EtoForms/Ui/EmailProviderForm.cs b/NAPS2.Lib/EtoForms/Ui/EmailProviderForm.cs
@@ -20,6 +20,7 @@ public EmailProviderForm(Naps2Config config, EmailProviderController controller,
     protected override void BuildLayout()
     {
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.DefaultSpacing = 0;
         LayoutController.Content = L.Column(

diff --git a/NAPS2.Lib/EtoForms/Ui/EmailSettingsForm.cs b/NAPS2.Lib/EtoForms/Ui/EmailSettingsForm.cs
@@ -35,6 +35,7 @@ protected override void BuildLayout()
     {
         FormStateController.DefaultExtraLayoutSize = new Size(60, 0);
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             L.GroupBox(

diff --git a/NAPS2.Lib/EtoForms/Ui/ErrorForm.cs b/NAPS2.Lib/EtoForms/Ui/ErrorForm.cs
@@ -22,6 +22,7 @@ protected override void BuildLayout()
 
         FormStateController.RestoreFormState = false;
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             L.Row(

diff --git a/NAPS2.Lib/EtoForms/Ui/ImageFormBase.cs b/NAPS2.Lib/EtoForms/Ui/ImageFormBase.cs
@@ -39,6 +39,8 @@ protected ImageFormBase(Naps2Config config, UiImageList imageList, ThumbnailCont
 
     protected override void BuildLayout()
     {
+        base.BuildLayout();
+
         LayoutController.Content = L.Column(
             Overlay.Scale(),
             CreateControls(),

diff --git a/NAPS2.Lib/EtoForms/Ui/ImageSettingsForm.cs b/NAPS2.Lib/EtoForms/Ui/ImageSettingsForm.cs
@@ -34,6 +34,7 @@ protected override void BuildLayout()
     {
         FormStateController.DefaultExtraLayoutSize = new Size(60, 0);
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             C.Label(UiStrings.DefaultFilePathLabel),

diff --git a/NAPS2.Lib/EtoForms/Ui/ManualIpForm.cs b/NAPS2.Lib/EtoForms/Ui/ManualIpForm.cs
@@ -31,6 +31,7 @@ protected override void BuildLayout()
     {
         FormStateController.RestoreFormState = false;
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             C.Label(UiStrings.IpHost),

diff --git a/NAPS2.Lib/EtoForms/Ui/OcrDownloadForm.cs b/NAPS2.Lib/EtoForms/Ui/OcrDownloadForm.cs
@@ -47,6 +47,7 @@ protected override void BuildLayout()
     {
         FormStateController.RestoreFormState = false;
         FormStateController.DefaultExtraLayoutSize = new Size(300, 300);
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             C.Label(UiStrings.OcrDownloadSummaryText),

diff --git a/NAPS2.Lib/EtoForms/Ui/OcrMultiLangForm.cs b/NAPS2.Lib/EtoForms/Ui/OcrMultiLangForm.cs
@@ -25,6 +25,7 @@ protected override void BuildLayout()
     {
         FormStateController.RestoreFormState = false;
         FormStateController.DefaultExtraLayoutSize = new Size(150, 20);
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             _languageList.Control.Scale(),

diff --git a/NAPS2.Lib/EtoForms/Ui/OcrSetupForm.cs b/NAPS2.Lib/EtoForms/Ui/OcrSetupForm.cs
@@ -62,6 +62,7 @@ public OcrSetupForm(Naps2Config config, TesseractLanguageManager tesseractLangua
     protected override void BuildLayout()
     {
         FormStateController.Resizable = false;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             _enableOcr,

diff --git a/NAPS2.Lib/EtoForms/Ui/PageSizeForm.cs b/NAPS2.Lib/EtoForms/Ui/PageSizeForm.cs
@@ -64,6 +64,7 @@ protected override void BuildLayout()
 
         FormStateController.RestoreFormState = false;
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             C.Label(UiStrings.NameOptional),

diff --git a/NAPS2.Lib/EtoForms/Ui/PdfPasswordForm.cs b/NAPS2.Lib/EtoForms/Ui/PdfPasswordForm.cs
@@ -24,6 +24,7 @@ protected override void BuildLayout()
 
         FormStateController.RestoreFormState = false;
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         _passwordBox.Title = FileName!;
         _passwordBox.TitleWrapWidth = 300;

diff --git a/NAPS2.Lib/EtoForms/Ui/PdfSettingsForm.cs b/NAPS2.Lib/EtoForms/Ui/PdfSettingsForm.cs
@@ -64,6 +64,7 @@ protected override void BuildLayout()
     {
         FormStateController.DefaultExtraLayoutSize = new Size(60, 0);
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             C.Label(UiStrings.DefaultFilePathLabel),

diff --git a/NAPS2.Lib/EtoForms/Ui/PlaceholdersForm.cs b/NAPS2.Lib/EtoForms/Ui/PlaceholdersForm.cs
@@ -38,6 +38,7 @@ protected override void BuildLayout()
 
         FormStateController.DefaultExtraLayoutSize = new Size(60, 0);
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             C.Label(UiStrings.FileNameLabel),

diff --git a/NAPS2.Lib/EtoForms/Ui/PreviewForm.cs b/NAPS2.Lib/EtoForms/Ui/PreviewForm.cs
@@ -130,6 +130,7 @@ protected override void BuildLayout()
     {
         FormStateController.AutoLayoutSize = false;
         FormStateController.DefaultClientSize = new Size(800, 600);
+        base.BuildLayout();
 
         LayoutController.RootPadding = 0;
         LayoutController.Content = ImageViewer;

diff --git a/NAPS2.Lib/EtoForms/Ui/ProfilesForm.cs b/NAPS2.Lib/EtoForms/Ui/ProfilesForm.cs
@@ -131,6 +131,7 @@ public ProfilesForm(Naps2Config config, IScanPerformer scanPerformer, ProfileNam
     protected override void BuildLayout()
     {
         FormStateController.DefaultExtraLayoutSize = new Size(200, 0);
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             L.Row(

diff --git a/NAPS2.Lib/EtoForms/Ui/ProgressForm.cs b/NAPS2.Lib/EtoForms/Ui/ProgressForm.cs
@@ -29,6 +29,7 @@ protected override void BuildLayout()
     {
         FormStateController.RestoreFormState = false;
         FormStateController.SaveFormState = false;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             _status,

diff --git a/NAPS2.Lib/EtoForms/Ui/RecoverForm.cs b/NAPS2.Lib/EtoForms/Ui/RecoverForm.cs
@@ -20,6 +20,7 @@ protected override void BuildLayout()
         FormStateController.SaveFormState = false;
         FormStateController.RestoreFormState = false;
         // FormStateController.Resizable = false;
+        base.BuildLayout();
 
         var recoverButton = C.DialogButton(this, UiStrings.Recover,
             beforeClose: () => SelectedAction = RecoverAction.Recover);

diff --git a/NAPS2.Lib/EtoForms/Ui/ScannerSharingForm.cs b/NAPS2.Lib/EtoForms/Ui/ScannerSharingForm.cs
@@ -77,6 +77,7 @@ public ScannerSharingForm(Naps2Config config, SharedDevicesListViewBehavior list
     protected override void BuildLayout()
     {
         FormStateController.DefaultExtraLayoutSize = new Size(200, 0);
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             C.Label(UiStrings.ScannerSharingIntro).DynamicWrap(400),

diff --git a/NAPS2.Lib/EtoForms/Ui/SettingsForm.cs b/NAPS2.Lib/EtoForms/Ui/SettingsForm.cs
@@ -54,6 +54,7 @@ protected override void BuildLayout()
     {
         FormStateController.DefaultExtraLayoutSize = new Size(60, 0);
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             L.GroupBox(

diff --git a/NAPS2.Lib/EtoForms/Ui/SharedDeviceForm.cs b/NAPS2.Lib/EtoForms/Ui/SharedDeviceForm.cs
@@ -50,6 +50,7 @@ protected override void BuildLayout()
     {
         FormStateController.DefaultExtraLayoutSize = new Size(60, 0);
         FormStateController.FixedHeightLayout = true;
+        base.BuildLayout();
 
         LayoutController.Content = L.Column(
             C.Label(UiStrings.DisplayNameLabel),