From 9c6e69914dbc8f6003e319d0d2c2f847d5fd089c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Mon, 13 Aug 2018 18:06:42 +0100 Subject: [PATCH] fixes an occasional crash with popup root "SnapInsideScreenEdges" --- src/Avalonia.Controls/Primitives/PopupRoot.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Avalonia.Controls/Primitives/PopupRoot.cs b/src/Avalonia.Controls/Primitives/PopupRoot.cs index 457a7bd4b4..996eb6204d 100644 --- a/src/Avalonia.Controls/Primitives/PopupRoot.cs +++ b/src/Avalonia.Controls/Primitives/PopupRoot.cs @@ -83,9 +83,7 @@ namespace Avalonia.Controls.Primitives /// public void SnapInsideScreenEdges() { - var window = this.GetSelfAndLogicalAncestors().OfType().First(); - - var screen = window.Screens.ScreenFromPoint(Position); + var screen = Application.Current.MainWindow.Screens.ScreenFromPoint(Position); var screenX = Position.X + Bounds.Width - screen.Bounds.X; var screenY = Position.Y + Bounds.Height - screen.Bounds.Y;