Browse Source

Use screen bounds if woking area is empty

pull/2993/head
Keroosha 7 years ago
parent
commit
08976e81c7
  1. 6
      src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs

6
src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs

@ -100,6 +100,12 @@ namespace Avalonia.Controls.Primitives.PopupPositioning
?? screens.FirstOrDefault(s => s.Bounds.Contains(parentGeometry.TopLeft)) ?? screens.FirstOrDefault(s => s.Bounds.Contains(parentGeometry.TopLeft))
?? screens.FirstOrDefault(s => s.Bounds.Intersects(parentGeometry)) ?? screens.FirstOrDefault(s => s.Bounds.Intersects(parentGeometry))
?? screens.FirstOrDefault(); ?? screens.FirstOrDefault();
if (targetScreen != null && targetScreen.WorkingArea.IsEmpty)
{
return targetScreen.Bounds;
}
return targetScreen?.WorkingArea return targetScreen?.WorkingArea
?? new Rect(0, 0, double.MaxValue, double.MaxValue); ?? new Rect(0, 0, double.MaxValue, double.MaxValue);
} }

Loading…
Cancel
Save