Merge pull request #13993 from unoplatform/dev/mazi/dpi-scaling

fix: Avoid DPI scaling issues on GTK
unoplatform · Oct 17, 2023 · 72dc180 · 72dc180
2 parents 34ec321 + eb339e5
commit 72dc180
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Extensions/GtkDisplayInformationExtension.cs b/src/Uno.UI.Runtime.Skia.Gtk/Extensions/GtkDisplayInformationExtension.cs
@@ -25,6 +25,7 @@ public GtkDisplayInformationExtension(object owner)
 	private void GtkDisplayInformationExtension_MainWindowShown(object? sender, EventArgs e)
 	{
 		_dpiHelper.DpiChanged += OnDpiChanged;
+		OnDpiChanged(null, EventArgs.Empty);
 	}
 
 	private Window GetWindow()
@@ -54,7 +55,7 @@ public float LogicalDpi
 				var nativeWindow = window.Window;
 				if (nativeWindow is not null)
 				{
-					_dpi = window.Display.GetMonitorAtWindow(nativeWindow).ScaleFactor * DisplayInformation.BaseDpi;
+					_dpi = _dpiHelper.GetNativeDpi();
 				}
 			}
 
@@ -71,7 +72,7 @@ public float LogicalDpi
 
 	private void OnDpiChanged(object? sender, EventArgs args)
 	{
-		_dpi = GetWindow().Display.GetMonitorAtWindow(GetWindow().Window).ScaleFactor * DisplayInformation.BaseDpi;
+		_dpi = _dpiHelper.GetNativeDpi();
 		_displayInformation.NotifyDpiChanged();
 	}
 }
diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Helpers/Dpi/DpiHelper.cs b/src/Uno.UI.Runtime.Skia.Gtk/Helpers/Dpi/DpiHelper.cs
@@ -65,7 +65,7 @@ private void CheckDpiUpdate()
 		}
 	}
 
-	private float GetNativeDpi()
+	internal float GetNativeDpi()
 	{
 		if (GetWindow().Window == null)
 		{

diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Rendering/GLRenderSurfaceBase.cs b/src/Uno.UI.Runtime.Skia.Gtk/Rendering/GLRenderSurfaceBase.cs
@@ -52,6 +52,7 @@ public GLRenderSurfaceBase(IXamlRootHost host)
 		{
 			_displayInformation = DisplayInformation.GetForCurrentView();
 			_displayInformation.DpiChanged += OnDpiChanged;
+			UpdateDpi();
 
 			// Set some event handlers
 			Render += UnoGLDrawingArea_Render;

diff --git a/src/Uno.UI.Runtime.Skia.Gtk/Rendering/SoftwareRenderSurface.cs b/src/Uno.UI.Runtime.Skia.Gtk/Rendering/SoftwareRenderSurface.cs
@@ -35,6 +35,7 @@ public SoftwareRenderSurface(IXamlRootHost host)
 	{
 		_displayInformation = DisplayInformation.GetForCurrentView();
 		_displayInformation.DpiChanged += OnDpiChanged;
+		UpdateDpi();
 
 		_colorType = SKImageInfo.PlatformColorType;
 		// R and B channels are inverted on macOS running on arm64 CPU and this is not detected by Skia
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,7 @@ private void CheckDpiUpdate() @@
     		}
     	}
-    	private float GetNativeDpi()
+    	internal float GetNativeDpi()
     	{
     		if (GetWindow().Window == null)
     		{
@@ Expand Down @@