Merge branch 'TaylerMauk-fix-issue-468'
This commit is contained in:
@@ -73,13 +73,18 @@ namespace FlaxEngine.GUI
|
||||
Vector2 locationWS = target.PointToWindow(location);
|
||||
Vector2 locationSS = parentWin.PointToScreen(locationWS);
|
||||
Vector2 screenSize = Platform.VirtualDesktopSize;
|
||||
Vector2 parentWinLocationSS = parentWin.PointToScreen(Vector2.Zero);
|
||||
float parentWinRightSS = parentWinLocationSS.Y + parentWin.Size.Y;
|
||||
float parentWinBottomSS = parentWinLocationSS.X + parentWin.Size.X;
|
||||
Vector2 rightBottomLocationSS = locationSS + dpiSize;
|
||||
if (screenSize.Y < rightBottomLocationSS.Y)
|
||||
|
||||
// Prioritize tooltip placement within parent window, fall back to virtual desktop
|
||||
if (parentWinRightSS < rightBottomLocationSS.Y || screenSize.Y < rightBottomLocationSS.Y)
|
||||
{
|
||||
// Direction: up
|
||||
locationSS.Y -= dpiSize.Y;
|
||||
}
|
||||
if (screenSize.X < rightBottomLocationSS.X)
|
||||
if (parentWinBottomSS < rightBottomLocationSS.X || screenSize.X < rightBottomLocationSS.X)
|
||||
{
|
||||
// Direction: left
|
||||
locationSS.X -= dpiSize.X;
|
||||
|
||||
Reference in New Issue
Block a user