Merge pull request #269 from pstranak-sw/feature/hiDpiSupport

Support for HiDPI

.gitignore

@@ -8,6 +8,7 @@ packages
 paket.dependencies
 paket.dependencies.locked
 .vs
+_ReSharper.Caches
 UpgradeLog.htm
 
 Samples/Java/swis-client/\.settings/

Src/SwqlStudio/3rdParty/ScintillaNET-FindReplaceDialog/FindReplace/FindReplaceDialog.cs

@@ -30,6 +30,7 @@ public partial class FindReplaceDialog : Form
 
         public FindReplaceDialog()
         {
+            this.Font = new Font("Tahoma", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
             InitializeComponent();
 
             _autoPosition = true;

Src/SwqlStudio/About.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Drawing;
+using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
 
@@ -8,6 +9,7 @@ public partial class About : Form
     {
         public About()
         {
+            this.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
             InitializeComponent();
 
             var assembly = Assembly.GetEntryAssembly();

Src/SwqlStudio/CrudTab.cs

@@ -3,6 +3,7 @@
 using System.Windows.Forms;
 using SolarWinds.InformationService.Contract2;
 using SwqlStudio.Metadata;
+using SwqlStudio.Utils;
 
 namespace SwqlStudio
 {
@@ -18,6 +19,7 @@ public CrudTab(CrudOperation operation)
         {
             _operation = operation;
             InitializeComponent();
+            DpiHelper.FixRowHeight(propertiesDataGridView);
         }
 
         public Entity Entity

Src/SwqlStudio/DocumentationContent.cs

@@ -1,4 +1,5 @@
 using System.Windows.Forms;
+using SwqlStudio.Utils;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace SwqlStudio
@@ -7,6 +8,7 @@ public partial class DocumentationContent : DockContent
     {
         public DocumentationContent()
         {
+            DpiHelper.FixFont(this);
             InitializeComponent();
         }
 

Src/SwqlStudio/EntityClassGraphForm.cs

@@ -1,13 +1,15 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using SolarWinds.InformationService.InformationServiceClient;
+using SwqlStudio.Utils;
 
 namespace SwqlStudio
 {
     public partial class EntityClassGraphForm : Form
     {
         public EntityClassGraphForm(EntityClassGraph entityClassGraph)
         {
+            DpiHelper.FixFont(this);
             InitializeComponent();
 
             LoadTree(entityClassGraph);

Src/SwqlStudio/MainForm.cs

@@ -39,6 +39,7 @@ public ConnectionInfo SelectedConnection
 
         public MainForm()
         {
+            DpiHelper.FixFont(this);
             InitializeComponent();
 
             InitializeDockPanel();

Src/SwqlStudio/NewConnection.cs

@@ -1,12 +1,14 @@
 using System;
 using System.Windows.Forms;
+using SwqlStudio.Utils;
 
 namespace SwqlStudio
 {
     internal partial class NewConnection : Form
     {
         public NewConnection()
         {
+            DpiHelper.FixFont(this);
             InitializeComponent();
 
             cmbServer.Items.AddRange(ConnectionHistory.PreviousServers);

Src/SwqlStudio/ObjectExplorer/ObjectExplorer.cs

@@ -38,7 +38,7 @@ internal class ObjectExplorer : Control
         private ImageList objectExplorerImageList;
         private System.ComponentModel.IContainer components;
         private TreeNode _dragNode;
-        private readonly TreeNodesBuilder treeNodesBuilder = new TreeNodesBuilder(DefaultFont);
+        private readonly TreeNodesBuilder treeNodesBuilder = new TreeNodesBuilder(DpiHelper.DefaultFont);
         public event TreeViewEventHandler SelectionChanged;
         public ITabsFactory TabsFactory { get; set; }
 

Src/SwqlStudio/QueryParameters.cs

@@ -3,6 +3,7 @@
 using System.Drawing;
 using System.Linq;
 using SolarWinds.InformationService.Contract2;
+using SwqlStudio.Utils;
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace SwqlStudio
@@ -27,7 +28,9 @@ public bool AllowSetParameters
 
         public QueryParameters()
         {
+            DpiHelper.FixFont(this);
             InitializeComponent();
+            DpiHelper.FixRowHeight(parametersGrid);
             parametersGrid.DataSource = new BindingList<QueryVariable>();
             AllowSetParameters = true;
         }

Src/SwqlStudio/QueryTab.cs

@@ -15,6 +15,7 @@
 using SwqlStudio.Playback;
 using SwqlStudio.Properties;
 using SwqlStudio.Subscriptions;
+using SwqlStudio.Utils;
 
 namespace SwqlStudio
 {
@@ -62,6 +63,8 @@ public QueryTab()
         {
             InitializeComponent();
             nullFont = new Font(dataGridView1.DefaultCellStyle.Font, dataGridView1.DefaultCellStyle.Font.Style | FontStyle.Italic);
+            DpiHelper.FixRowHeight(dataGridView1);
+            DpiHelper.FixRowHeight(dataGridView2);
             ShowTabs(Tabs.Results);
             Disposed += QueryTabDisposed;
             AddRunContextMenu();
@@ -476,9 +479,9 @@ private void queryWorker_RunWorkerCompleted(object sender, System.ComponentModel
             }
         }
 
-        private static void AutoResizeColumns(DataGridView grid)
+        private void AutoResizeColumns(DataGridView grid)
         {
-            const int maxSize = 200;
+            int maxSize = base.LogicalToDeviceUnits(200);
             const int widthFudgeFactor = 25;
 
             int[] preferredSizes = new int[grid.ColumnCount];

Src/SwqlStudio/TabTemplate.cs

@@ -1,4 +1,5 @@
 using System.Windows.Forms;
+using SwqlStudio.Utils;
 
 namespace SwqlStudio
 {
@@ -20,5 +21,10 @@ public virtual bool AllowsChangeConnection
         {
             get { return true; }
         }
+
+        public TabTemplate()
+        {
+            DpiHelper.FixFont(this);
+        }
     }
 }

Src/SwqlStudio/Utils/DpiHelper.cs

@@ -0,0 +1,49 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace SwqlStudio.Utils
+{
+    /// <summary>
+    /// A helper class for supporting font and DPI scaling
+    /// </summary>
+    /// <remarks>
+    /// <para>This dimensions of the default font are used to calculate a proper DPI scaling ratio of elements. .Net Framework tries to use "MS Sans Serif"
+    /// from Windows 3.1, which isn't available anymore. So the system automatically replaces it with "Microsoft Sans Serif", or sometimes with "Tahoma".
+    /// But those are too old and don't match with Windows UI fonts. And if there are elements using also other fonts, like "Segoe UI", it messes up the calculation.
+    /// That can happen especially when a different font is used for rendering than for the DPI scaling calculation.</para>
+    /// <para>This should not be needed anymore in .Net Core 3.1 and .Net 5: https://github.com/dotnet/winforms/pull/656 </para>
+    /// </remarks>
+    internal static class DpiHelper
+    {
+        /// <summary>
+        /// The default font used in SWQL Studio dialogs
+        /// </summary>
+        /// <remarks>Returns the default .Net font.</remarks>
+        /// <value>Microsoft Sans Serif, 8.25F</value>
+        public static readonly Font DefaultFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0);
+
+        /// <summary>
+        /// Sets the <see cref="DefaultFont"/> as the default font for the <paramref name="control"/>
+        /// </summary>
+        /// <param name="control">Usually a <see cref="Form"/></param>
+        /// <remarks>This is needed to correctly calculate a proper DPI scaling ratio of the <paramref name="control"/> and its child elements.
+        /// It forces the <paramref name="control"/> to sync the fonts used for its rendering and DPI scaling calculation.
+        /// <para>This should be called in the <paramref name="control"/>'s constructor.</para></remarks>
+        public static void FixFont(Control control)
+        {
+            control.Font = DefaultFont;
+        }
+
+        /// <summary>
+        /// Adjusts the default row height in a <see cref="DataGridView"/>
+        /// </summary>
+        /// <remarks>The default row height is defined as the height of the default font + 9 pixels.
+        /// This method, when called after <see cref="FixFont"/>, forces the recalculation of the height.</remarks>
+        public static void FixRowHeight(DataGridView dataGridView)
+        {
+            // Instead of "dataGridView.DefaultCellStyle.Font.Height" we could just hard-code "DefaultFont". That way, this method would not depend
+            // on a previous call to "FixFont". But this is a bit more universal solution.
+            dataGridView.RowTemplate.Height = dataGridView.DefaultCellStyle.Font.Height + 9;
+        }
+    }
+}