Allow session info and overlay data grid shrinking

tremwil · May 9, 2021 · abf4588 · abf4588
1 parent 2db7d27
commit abf4588
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/DS3ConnectionInfo/MainWindow.xaml.cs b/DS3ConnectionInfo/MainWindow.xaml.cs
@@ -100,6 +100,22 @@ private void UpdateTimer_Tick(object sender, EventArgs e)
             foreach (Player p in Player.ActivePlayers())
                 playerData.Add(p);
 
+            // Update session info column sizes
+            foreach (var col in dataGridSession.Columns)
+            {
+                col.Width = new DataGridLength(1, DataGridLengthUnitType.Pixel);
+                col.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            }
+            dataGridSession.UpdateLayout();
+
+            // Update overlay column sizes
+            foreach (var col in overlay.dataGrid.Columns)
+            {
+                col.Width = new DataGridLength(1, DataGridLengthUnitType.Pixel);
+                col.Width = new DataGridLength(1, DataGridLengthUnitType.SizeToCells);
+            }
+            overlay.dataGrid.UpdateLayout();
+
             // Queue position update after the overlay has re-rendered
             Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(overlay.UpdatePosition));
 

diff --git a/DS3ConnectionInfo/OverlayWindow.xaml b/DS3ConnectionInfo/OverlayWindow.xaml
@@ -39,7 +39,7 @@
             </local:OverlayTextBlock.Style>
         </local:OverlayTextBlock>
         <DataGrid CanUserSortColumns="False" IsReadOnly="True" CanUserReorderColumns="False" CanUserResizeColumns="False" HeadersVisibility="None" 
-                  Background="Transparent" RowBackground="Transparent" ItemsSource="{Binding}" AutoGenerateColumns="False" Name="dataGrid">
+                  Background="Transparent" RowBackground="Transparent" ItemsSource="{Binding}" AutoGenerateColumns="False" Name="dataGrid" ColumnWidth="SizeToCells">
             <DataGrid.Columns>
                 <DataGridTemplateColumn Header="Slot" SortDirection="Ascending">
                     <DataGridTemplateColumn.CellTemplate>