Fixes #1165 by using DPI scaling for popup placement

fluentribbon · Sep 4, 2023 · 3f5df94 · 3f5df94
1 parent 8e3ccb8
commit 3f5df94
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,11 @@
 # Changelog for Fluent.Ribbon
 
+## 10.0.4
+
+- ### Bug fixes
+
+  - [#1165](../../issues/1165) - ScreenTip is not DPI aware
+
 ## 10.0.3
 
 - ### Bug fixes

diff --git a/Fluent.Ribbon/Controls/ScreenTip.cs b/Fluent.Ribbon/Controls/ScreenTip.cs
@@ -61,12 +61,15 @@ private CustomPopupPlacement[] CustomPopupPlacementMethod(Size popupSize, Size t
         UIElement? topLevelElement = null;
         FindControls(this.PlacementTarget, ref ribbon, ref topLevelElement);
 
+        var dpiScale = VisualTreeHelper.GetDpi(this.PlacementTarget);
+
         // Exclude QAT items
         var notQuickAccessItem = !IsQuickAccessItem(this.PlacementTarget);
         var notContextMenuChild = !IsContextMenuChild(this.PlacementTarget);
         var rightToLeftOffset = this.FlowDirection == FlowDirection.RightToLeft
             ? -popupSize.Width
             : 0;
+        var rightToLeftOffsetScaled = rightToLeftOffset * dpiScale.DpiScaleX;
 
         var decoratorChild = GetDecoratorChild(topLevelElement);
 
@@ -75,9 +78,12 @@ private CustomPopupPlacement[] CustomPopupPlacementMethod(Size popupSize, Size t
             && ribbon is not null)
         {
             var belowY = ribbon.TranslatePoint(new Point(0, ribbon.ActualHeight), this.PlacementTarget).Y;
+            belowY *= dpiScale.DpiScaleY;
             var aboveY = ribbon.TranslatePoint(new Point(0, 0), this.PlacementTarget).Y - popupSize.Height;
-            var below = new CustomPopupPlacement(new Point(rightToLeftOffset, belowY + 1), PopupPrimaryAxis.Horizontal);
-            var above = new CustomPopupPlacement(new Point(rightToLeftOffset, aboveY - 1), PopupPrimaryAxis.Horizontal);
+            aboveY *= dpiScale.DpiScaleY;
+
+            var below = new CustomPopupPlacement(new Point(rightToLeftOffsetScaled, belowY + 1), PopupPrimaryAxis.Horizontal);
+            var above = new CustomPopupPlacement(new Point(rightToLeftOffsetScaled, aboveY - 1), PopupPrimaryAxis.Horizontal);
             return new[] { below, above };
         }
 
@@ -89,16 +95,19 @@ private CustomPopupPlacement[] CustomPopupPlacementMethod(Size popupSize, Size t
         {
             // Placed on Popup?
             var belowY = decoratorChild.TranslatePoint(new Point(0, ((FrameworkElement)decoratorChild).ActualHeight), this.PlacementTarget).Y;
+            belowY *= dpiScale.DpiScaleY;
             var aboveY = decoratorChild.TranslatePoint(new Point(0, 0), this.PlacementTarget).Y - popupSize.Height;
-            var below = new CustomPopupPlacement(new Point(rightToLeftOffset, belowY + 1), PopupPrimaryAxis.Horizontal);
-            var above = new CustomPopupPlacement(new Point(rightToLeftOffset, aboveY - 1), PopupPrimaryAxis.Horizontal);
+            aboveY *= dpiScale.DpiScaleY;
+
+            var below = new CustomPopupPlacement(new Point(rightToLeftOffsetScaled, belowY + 1), PopupPrimaryAxis.Horizontal);
+            var above = new CustomPopupPlacement(new Point(rightToLeftOffsetScaled, aboveY - 1), PopupPrimaryAxis.Horizontal);
             return new[] { below, above };
         }
 
         return new[]
         {
-            new CustomPopupPlacement(new Point(rightToLeftOffset, this.PlacementTarget.RenderSize.Height + 1), PopupPrimaryAxis.Horizontal),
-            new CustomPopupPlacement(new Point(rightToLeftOffset, -popupSize.Height - 1), PopupPrimaryAxis.Horizontal)
+            new CustomPopupPlacement(new Point(rightToLeftOffsetScaled, (this.PlacementTarget.RenderSize.Height + 1) * dpiScale.DpiScaleY), PopupPrimaryAxis.Horizontal),
+            new CustomPopupPlacement(new Point(rightToLeftOffsetScaled, (-popupSize.Height - 1) * dpiScale.DpiScaleY), PopupPrimaryAxis.Horizontal)
         };
     }