Fixed several high DPI issues

Author: couchcoding

src/GuiLibrary/Controls/ListBoxEx.cs

@@ -28,6 +28,7 @@
 
 #endregion
 
+using Com.Couchcoding.GuiLibrary.Helper;
 using System;
 using System.ComponentModel;
 using System.Drawing;
@@ -135,7 +136,7 @@ public override string ToString()
       }
       set
       {
-        base.ItemHeight = value;
+        base.ItemHeight = DpiHelper.RescaleByDpiY(value);
       }
     }
 
@@ -155,9 +156,11 @@ public int SeperatorHeight
       }
       set
       {
-        if (value > 0 && mSeperatorHeight != value)
+        int newValue = DpiHelper.RescaleByDpiY(value);
+
+        if (newValue > 0 && mSeperatorHeight != newValue)
         {
-          mSeperatorHeight = value;
+          mSeperatorHeight = newValue;
         }
       }
     }

src/GuiLibrary/Dialogs/DialogForm.cs

@@ -28,6 +28,7 @@
 
 #endregion
 
+using Com.Couchcoding.GuiLibrary.Helper;
 using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
@@ -41,16 +42,6 @@ public class DialogForm : Form
   {
     #region Private Consts
 
-    /// <summary>
-    /// Defines the default horizontal resolution.
-    /// </summary>
-    protected const float DEFAULT_DPI_Y = 96.0f;
-
-    /// <summary>
-    /// Defines the defualt vertical resolution.
-    /// </summary>
-    protected const float DEFAULT_DPI_X = 96.0f;
-
     /// <summary>
     /// Defines the height of the button area within the dialog.
     /// </summary>
@@ -65,8 +56,6 @@ public class DialogForm : Form
 
     #region Private Fields
 
-    private static SizeF mDpiSize = new SizeF(96.0f, 96.0f);
-
     private bool   mShowHeaderArea         = true;
     private bool   mShowFooterArea         = true;
     private Color  mContentColor           = SystemColors.Control;
@@ -341,46 +330,11 @@ protected void RecalculatePadding()
     {
       Padding = new Padding(
           5
-        , mShowHeaderArea ? RescaleByDpiY(HEADER_AREA_HEIGHT) + 5 : 5
+        , mShowHeaderArea ? HEADER_AREA_HEIGHT + 5 : 5
         , 5
         , 5);
     }
 
-    /// <summary>
-    /// Reloads the current DPI-Settings of the system.
-    /// </summary>
-    /// <param name="ctrl">The <see cref="Control"/> to use the <see cref="Graphics"/> object from.</param>
-    protected static void ReloadDpiSettings(Control ctrl)
-    {
-      if (ctrl != null)
-      {
-        using (Graphics grfx = ctrl.CreateGraphics())
-        {
-          mDpiSize = new SizeF(grfx.DpiX, grfx.DpiY);
-        }
-      }
-    }
-
-    /// <summary>
-    /// Rescales the given value by the currently used DPI-Settings.
-    /// </summary>
-    /// <param name="value">The value to rescale.</param>
-    /// <returns>The rescaled value.</returns>
-    protected static int RescaleByDpiY(int value)
-    {
-      return (int)((value / DEFAULT_DPI_Y) * mDpiSize.Height);
-    }
-
-    /// <summary>
-    /// Rescales the given value by the currently used DPI-Settings.
-    /// </summary>
-    /// <param name="value">The value to rescale.</param>
-    /// <returns>The rescaled value.</returns>
-    protected static int RescaleByDpiX(int value)
-    {
-      return (int)((value / DEFAULT_DPI_X) * mDpiSize.Width);
-    }
-
     /// <summary>
     /// Draws the dialog as a default MSR dialog.
     /// </summary>
@@ -389,7 +343,7 @@ protected virtual void DrawDialogBackground(Graphics grfx)
     {
       if (mShowHeaderArea && Width > 0 && Height > 0)
       {
-        int headerHeight = RescaleByDpiY(HEADER_AREA_HEIGHT);
+        int headerHeight = DpiHelper.RescaleByDpiY(HEADER_AREA_HEIGHT);
 
         if (mHeaderColor != Color.Transparent && mHeaderColor != mContentColor)
         {
@@ -439,8 +393,8 @@ protected virtual void DrawDialogBackground(Graphics grfx)
                 , captionFont
                 , captionBrush
                 , new Point(
-                    RescaleByDpiY(12)
-                  , RescaleByDpiY(8)));
+                    DpiHelper.RescaleByDpiY(12)
+                  , DpiHelper.RescaleByDpiY(8)));
             }
           }
         }
@@ -458,10 +412,10 @@ protected virtual void DrawDialogBackground(Graphics grfx)
                 , Font
                 , textBrush
                 , new RectangleF(
-                    RescaleByDpiY(24)
-                  , RescaleByDpiY(30)
-                  , ClientRectangle.Width - imgSpaceLeft - RescaleByDpiX(30)
-                  , headerHeight - RescaleByDpiY(22))
+                    DpiHelper.RescaleByDpiY(24)
+                  , DpiHelper.RescaleByDpiY(30)
+                  , ClientRectangle.Width - imgSpaceLeft - DpiHelper.RescaleByDpiX(30)
+                  , headerHeight - DpiHelper.RescaleByDpiY(22))
                 , sFormat);
             }
           }
@@ -477,7 +431,7 @@ protected override void OnPaint(PaintEventArgs e)
     {
       base.OnPaint(e);
 
-      int buttonHeight = mShowFooterArea ? RescaleByDpiY(BUTTON_AREA_HEIGHT) : 0;
+      int buttonHeight = mShowFooterArea ? DpiHelper.RescaleByDpiY(BUTTON_AREA_HEIGHT) : 0;
 
       using (Brush contentBrush = new SolidBrush(ContentColor))
       {
@@ -524,9 +478,7 @@ protected DialogForm()
       SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
       SetStyle(ControlStyles.ResizeRedraw,          true);
 
-      AutoScaleMode = AutoScaleMode.Dpi;
-      Font          = SystemFonts.MessageBoxFont;
-
+      Font                   = SystemFonts.MessageBoxFont;
       ContentColor           = SystemColors.Control;
       HeaderColor            = Color.White;
       HeaderDescriptionColor = Color.DimGray;
@@ -537,7 +489,6 @@ protected DialogForm()
       ShowInTaskbar = false;
       StartPosition = FormStartPosition.CenterParent;
 
-      ReloadDpiSettings(this);
       RecalculatePadding();
     }
 

src/GuiLibrary/GuiLibrary.csproj

@@ -99,6 +99,7 @@
     <Compile Include="Dialogs\DialogForm.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Helper\DpiHelper.cs" />
     <Compile Include="Interop\Win32.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

src/GuiLibrary/Helper/DpiHelper.cs

@@ -0,0 +1,103 @@
+#region Copyright © 2015 Couchcoding
+
+// File:    DialogForm.cs
+// Package: GuiLibrary
+// Project: Logbert
+// 
+// The MIT License (MIT)
+// 
+// Copyright (c) 2017 Couchcoding
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#endregion
+
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Com.Couchcoding.GuiLibrary.Helper
+{
+  /// <summary>
+  /// Implements a helper class for DPI scaling.
+  /// </summary>
+  public sealed class DpiHelper
+  {
+    #region Private Consts
+
+    /// <summary>
+    /// Defines the default horizontal resolution.
+    /// </summary>
+    private const float DEFAULT_DPI_Y = 96.0f;
+
+    /// <summary>
+    /// Defines the default vertical resolution.
+    /// </summary>
+    private const float DEFAULT_DPI_X = 96.0f;
+
+    #endregion
+
+    #region Private Fields
+
+    /// <summary>
+    /// Holds the calculated DPI scaling.
+    /// </summary>
+    private static SizeF mDpiSize = new SizeF(96.0f, 96.0f);
+
+    #endregion
+
+    #region Public Methods
+
+    /// <summary>
+    /// Reloads the current DPI-Settings of the system.
+    /// </summary>
+    /// <param name="ctrl">The <see cref="Control"/> to use the <see cref="Graphics"/> object from.</param>
+    public static void ReloadDpiSettings(Control ctrl)
+    {
+      if (ctrl != null)
+      {
+        using (Graphics grfx = ctrl.CreateGraphics())
+        {
+          mDpiSize = new SizeF(grfx.DpiX, grfx.DpiY);
+        }
+      }
+    }
+
+    /// <summary>
+    /// Rescales the given value by the currently used DPI-Settings.
+    /// </summary>
+    /// <param name="value">The value to rescale.</param>
+    /// <returns>The rescaled value.</returns>
+    public static int RescaleByDpiY(int value)
+    {
+      return (int)((value / DEFAULT_DPI_Y) * mDpiSize.Height);
+    }
+
+    /// <summary>
+    /// Rescales the given value by the currently used DPI-Settings.
+    /// </summary>
+    /// <param name="value">The value to rescale.</param>
+    /// <returns>The rescaled value.</returns>
+    public static int RescaleByDpiX(int value)
+    {
+      return (int)((value / DEFAULT_DPI_X) * mDpiSize.Width);
+    }
+
+    #endregion
+  }
+}

src/GuiLibrary/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.1.0")]
-[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.3.2.0")]
+[assembly: AssemblyFileVersion("1.3.2.0")]

src/Logbert/Dialogs/Docking/FrmLogDocument.cs

@@ -43,6 +43,7 @@
 using Com.Couchcoding.Logbert.Properties;
 
 using WeifenLuo.WinFormsUI.Docking;
+using Com.Couchcoding.GuiLibrary.Helper;
 
 namespace Com.Couchcoding.Logbert.Dialogs.Docking
 {