Browse Source

Fix for Popup

pull/950/merge
Nikita Tsukanov 9 years ago
parent
commit
85350b27b2
  1. 2
      src/Avalonia.Controls/Primitives/Popup.cs

2
src/Avalonia.Controls/Primitives/Popup.cs

@ -344,7 +344,7 @@ namespace Avalonia.Controls.Primitives
{ {
// Scales the Horizontal and Vertical offset to screen co-ordinates. // Scales the Horizontal and Vertical offset to screen co-ordinates.
var screenOffset = new Point(HorizontalOffset * (PopupRoot as ILayoutRoot).LayoutScaling, VerticalOffset * (PopupRoot as ILayoutRoot).LayoutScaling); 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); return default(Point);

Loading…
Cancel
Save