Browse Source
Merge pull request #2111 from AvaloniaUI/fixes/popup-obey-screen-edges-dpi
fix SnapInsideScreenEdges so that it obeys screen scaling.
pull/2118/head
danwalmsley
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
2 deletions
-
src/Avalonia.Controls/Primitives/PopupRoot.cs
|
|
|
@ -84,8 +84,10 @@ namespace Avalonia.Controls.Primitives |
|
|
|
|
|
|
|
if (screen != null) |
|
|
|
{ |
|
|
|
var screenX = Position.X + Bounds.Width - screen.Bounds.X; |
|
|
|
var screenY = Position.Y + Bounds.Height - screen.Bounds.Y; |
|
|
|
var scaling = VisualRoot.RenderScaling; |
|
|
|
|
|
|
|
var screenX = Position.X + (Bounds.Width * scaling) - screen.Bounds.X; |
|
|
|
var screenY = Position.Y + (Bounds.Height * scaling) - screen.Bounds.Y; |
|
|
|
|
|
|
|
if (screenX > screen.Bounds.Width) |
|
|
|
{ |
|
|
|
|
