Change layout and fix event handler completion

zrh4 · zrh4 · commit 5908655d5033 · 2022-11-17T19:57:48.000-05:00
diff --git a/CrossStitchProject/PatternMakerMainForm.Designer.cs b/CrossStitchProject/PatternMakerMainForm.Designer.cs
diff --git a/CrossStitchProject/PatternMakerMainForm.cs b/CrossStitchProject/PatternMakerMainForm.cs
@@ -40,7 +40,7 @@ private void CrossStitchButton_Click(object sender, EventArgs e)
         {
             crossStitchButton.Enabled = false;
             ShowWaitCursor();
-            if (!previewWorker.IsBusy)
+            if (!patternWorker.IsBusy)
             {
                 patternWorker.RunWorkerAsync();
             }
@@ -82,22 +82,29 @@ private void PreviewWorker_DoWork(object sender, System.ComponentModel.DoWorkEve
         }
         private void PreviewWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            previewButton.Enabled = true;
             ShowNormalCursor();
+            previewButton.Enabled = true;
             if (e.Result == null) { return; }
-            var preview = (Bitmap)e.Result;
-            using (var previewForm = new Form())
+            try
             {
-                previewForm.StartPosition = FormStartPosition.CenterScreen;
-                previewForm.Width = preview.Width + 50;
-                previewForm.Height = preview.Height + 50;
-                var pb = new PictureBox
+                var preview = (Bitmap)e.Result;
+                using (var previewForm = new Form())
                 {
-                    Dock = DockStyle.Fill,
-                    Image = preview
-                };
-                previewForm.Controls.Add(pb);
-                previewForm.ShowDialog();
+                    previewForm.StartPosition = FormStartPosition.CenterScreen;
+                    previewForm.Width = preview.Width + 50;
+                    previewForm.Height = preview.Height + 50;
+                    var pb = new PictureBox
+                    {
+                        Dock = DockStyle.Fill,
+                        Image = preview
+                    };
+                    previewForm.Controls.Add(pb);
+                    previewForm.ShowDialog();
+                }
+            }
+            catch(Exception ex)
+            {
+                DisplayException("Error generating preview", ex);
             }
         }
 
diff --git a/CrossStitchProject/PatternMakerMainForm.resx b/CrossStitchProject/PatternMakerMainForm.resx
@@ -120,9 +120,6 @@
   <metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="fileLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="previewWorker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>157, 17</value>
   </metadata>

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ private void CrossStitchButton_Click(object sender, EventArgs e)`
`40`	`40`	`{`
`41`	`41`	`crossStitchButton.Enabled = false;`
`42`	`42`	`ShowWaitCursor();`
`43`		`- if (!previewWorker.IsBusy)`
	`43`	`+ if (!patternWorker.IsBusy)`
`44`	`44`	`{`
`45`	`45`	`patternWorker.RunWorkerAsync();`
`46`	`46`	`}`
`@@ -82,22 +82,29 @@ private void PreviewWorker_DoWork(object sender, System.ComponentModel.DoWorkEve`
`82`	`82`	`}`
`83`	`83`	`private void PreviewWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)`
`84`	`84`	`{`
`85`		`- previewButton.Enabled = true;`
`86`	`85`	`ShowNormalCursor();`
	`86`	`+ previewButton.Enabled = true;`
`87`	`87`	`if (e.Result == null) { return; }`
`88`		`- var preview = (Bitmap)e.Result;`
`89`		`- using (var previewForm = new Form())`
	`88`	`+ try`
`90`	`89`	`{`
`91`		`- previewForm.StartPosition = FormStartPosition.CenterScreen;`
`92`		`- previewForm.Width = preview.Width + 50;`
`93`		`- previewForm.Height = preview.Height + 50;`
`94`		`- var pb = new PictureBox`
	`90`	`+ var preview = (Bitmap)e.Result;`
	`91`	`+ using (var previewForm = new Form())`
`95`	`92`	`{`
`96`		`- Dock = DockStyle.Fill,`
`97`		`- Image = preview`
`98`		`- };`
`99`		`- previewForm.Controls.Add(pb);`
`100`		`- previewForm.ShowDialog();`
	`93`	`+ previewForm.StartPosition = FormStartPosition.CenterScreen;`
	`94`	`+ previewForm.Width = preview.Width + 50;`
	`95`	`+ previewForm.Height = preview.Height + 50;`
	`96`	`+ var pb = new PictureBox`
	`97`	`+ {`
	`98`	`+ Dock = DockStyle.Fill,`
	`99`	`+ Image = preview`
	`100`	`+ };`
	`101`	`+ previewForm.Controls.Add(pb);`
	`102`	`+ previewForm.ShowDialog();`
	`103`	`+ }`
	`104`	`+ }`
	`105`	`+ catch(Exception ex)`
	`106`	`+ {`
	`107`	`+ DisplayException("Error generating preview", ex);`
`101`	`108`	`}`
`102`	`109`	`}`
`103`	`110`