make window resize dynamically on font size changes

doubleyewdee · Dec 6, 2018 · 088920f · 088920f
1 parent e3dcbed
commit 088920f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/src/condo/MainWindow.xaml b/src/condo/MainWindow.xaml
@@ -6,8 +6,15 @@
         xmlns:local="clr-namespace:condo"
         mc:Ignorable="d"
         Title="MainWindow" SizeToContent="WidthAndHeight">
-    <Grid>
-        <ScrollViewer Name="scrollViewer" CanContentScroll="true" IsDeferredScrollingEnabled="true" Focusable="False">
+    <Grid Name="grid">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <ScrollViewer Name="scrollViewer" Grid.Column="0" Grid.Row="0"
+                      CanContentScroll="true" IsDeferredScrollingEnabled="true" Focusable="False">
             <local:Screen x:Name="screen" />
         </ScrollViewer>
     </Grid>

diff --git a/src/condo/MainWindow.xaml.cs b/src/condo/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 namespace condo
 {
+    using System;
     using System.ComponentModel;
     using System.Security;
     using System.Windows;
@@ -36,7 +37,6 @@ private bool IsOSVersionSupported()
         public MainWindow()
         {
             this.InitializeComponent();
-            this.Loaded += this.OnLoaded;
 
             // XXX: lazy dark but not painfully bright palette
             this.mellowPalette = new XtermPalette();
@@ -56,8 +56,9 @@ public MainWindow()
             this.mellowPalette[13] = new Character.ColorInfo { R = 0xb2, G = 0x94, B = 0xbb };
             this.mellowPalette[14] = new Character.ColorInfo { R = 0x8a, G = 0xbe, B = 0xb7 };
             this.mellowPalette[15] = new Character.ColorInfo { R = 0xc5, G = 0xc8, B = 0xc6 };
-
             this.screen.Palette = this.mellowPalette;
+
+            this.Loaded += this.OnLoaded;
         }
 
         private void OnLoaded(object sender, RoutedEventArgs e)
@@ -74,6 +75,7 @@ private void OnLoaded(object sender, RoutedEventArgs e)
                 return;
             }
 
+            this.InitializeWindowSizeHandling();
             this.console = TerminalManager.Instance.GetOrCreate(0, "wsl.exe");
             this.keyHandler = new KeyHandler(this.console);
 
@@ -122,6 +124,22 @@ private void OnLoaded(object sender, RoutedEventArgs e)
             this.Closing += this.HandleClosing;
         }
 
+        private double windowFrameWidth, windowFrameHeight;
+        private void InitializeWindowSizeHandling()
+        {
+            this.windowFrameWidth = this.ActualWidth - this.grid.ActualWidth;
+            this.windowFrameHeight = this.ActualHeight - this.grid.ActualHeight;
+
+            this.MinWidth = this.ActualWidth;
+            this.MinHeight = this.ActualHeight;
+
+            this.scrollViewer.SizeChanged += (_, args) =>
+            {
+                this.MinWidth = this.windowFrameWidth + args.NewSize.Width;
+                this.MinHeight = this.windowFrameHeight + args.NewSize.Height;
+            };
+        }
+
         private void HandleClosing(object sender, CancelEventArgs e)
         {
             this.screen.Close();

diff --git a/src/condo/Screen.cs b/src/condo/Screen.cs
@@ -378,7 +378,7 @@ private void ForceFullRedraw()
             this.shouldRedraw = 1;
         }
 
-#region IScrollInfo
+        #region IScrollInfo
         public bool CanVerticallyScroll { get; set; }
         public bool CanHorizontallyScroll { get; set; }
 
@@ -465,6 +465,6 @@ public Rect MakeVisible(Visual visual, Rect rectangle)
         {
             throw new NotImplementedException();
         }
-#endregion
+        #endregion
     }
 }