Browse Source

Fix for Popup

Nikita Tsukanov 8 years ago
parent
commit
85350b27b2
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/Avalonia.Controls/Primitives/Popup.cs

+ 1 - 1
src/Avalonia.Controls/Primitives/Popup.cs

@@ -344,7 +344,7 @@ namespace Avalonia.Controls.Primitives
                     {
                         // Scales the Horizontal and Vertical offset to screen co-ordinates.
                         var screenOffset = new Point(HorizontalOffset * (PopupRoot as ILayoutRoot).LayoutScaling, VerticalOffset * (PopupRoot as ILayoutRoot).LayoutScaling);
-                        return ((IInputRoot)PopupRoot).MouseDevice.Position + screenOffset;
+                        return (((IInputRoot)PopupRoot)?.MouseDevice?.Position ?? default(Point)) + screenOffset;
                     }
 
                     return default(Point);