b/368413719 Handle resize even when window is minimized (#1487)

GoogleCloudPlatform · Sep 20, 2024 · 07ea522 · 07ea522
1 parent d413d80
commit 07ea522
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 4 deletions.
diff --git a/sources/Google.Solutions.Terminal.Test/Controls/TestVirtualTerminal.cs b/sources/Google.Solutions.Terminal.Test/Controls/TestVirtualTerminal.cs
@@ -52,7 +52,10 @@ private TerminalForm()
 
             internal static TerminalForm Create()
             {
-                var form = new TerminalForm();
+                var form = new TerminalForm()
+                {
+                    Size = new Size(800, 600)
+                };
 
                 //
                 // When run in a headless environment, the terminal
@@ -332,6 +335,43 @@ public void CaretStyle_WhenChanged_ThenRaisesEvent()
                 Assert.IsTrue(themeChangeEventRaised);
             }
         }
+
+        //---------------------------------------------------------------------
+        // Dimensions.
+        //---------------------------------------------------------------------
+
+        [Test]
+        public void Dimensions()
+        {
+            using (var form = TerminalForm.Create())
+            {
+                form.Show();
+
+                Assert.Greater(form.VirtualTerminal.Dimensions.Width, 80);
+                Assert.Greater(form.VirtualTerminal.Dimensions.Height, 20);
+
+                form.Close();
+            }
+        }
+
+        [Test]
+        public void Dimensions_WhenMinimized_ThenDimensionsAreKept()
+        {
+            using (var form = TerminalForm.Create())
+            {
+                form.Show();
+
+                var dimensions = form.VirtualTerminal.Dimensions;
+
+                form.WindowState = FormWindowState.Minimized;
+                Assert.AreEqual(dimensions, form.VirtualTerminal.Dimensions);
+
+                form.WindowState = FormWindowState.Normal;
+                Assert.AreEqual(dimensions, form.VirtualTerminal.Dimensions);
+
+                form.Close();
+            }
+        }
     }
 
     public static class VirtualTerminalAssert

diff --git a/sources/Google.Solutions.Terminal.TestApp/Program.cs b/sources/Google.Solutions.Terminal.TestApp/Program.cs
@@ -37,13 +37,14 @@ public static void Main(string[] argv)
             {
                 Width = 800,
                 Height = 600,
+                Text = "Terminal TestApp"
             })
             {
                 var control = new VirtualTerminal()
                 {
                     Dock = DockStyle.Fill,
-                    ForeColor = Color.Beige,
-                    BackColor = Color.DarkGray
+                    ForeColor = Color.LightGray,
+                    BackColor = Color.Black
                 };
 
                 f.Controls.Add(control);

diff --git a/sources/Google.Solutions.Terminal/Controls/VirtualTerminal.cs b/sources/Google.Solutions.Terminal/Controls/VirtualTerminal.cs
@@ -478,7 +478,11 @@ protected override void OnResize(EventArgs e)
         {
             if (this.Width == 0 || this.Height == 0)
             {
-                throw new ArgumentException("Size cannot be zero");
+                //
+                // This happens when the window is being minimized.
+                // We can ignore that.
+                //
+                return;
             }
 
             //