GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Title bar High DPI fix.

Browse Source
This commit is contained in:
Jean-Baptiste Perrier
2020-12-19 13:47:59 +01:00
parent 68e3b279fa
commit 6cefab801f
1 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Source/Editor/GUI/MainMenu.cs
View File

@@ -193,41 +193,64 @@ namespace FlaxEditor.GUI
if (!_window.IsMaximized) if (!_window.IsMaximized)
{ {
var winSize = RootWindow.Size * Platform.DpiScale; var winSize = RootWindow.Size * Platform.DpiScale;
/*
if (pos.Y > winSize.Y - 5 && pos.X < 5) * Distance from which the mouse is considered to be on the border/corner
* You can change the distance by modifying the x value in : (int)(x * Platform.DpiScale)
*/
int distance = (int)(10 * Platform.DpiScale);
if (pos.Y > winSize.Y - distance && pos.X < distance)
return WindowHitCodes.BottomLeft; return WindowHitCodes.BottomLeft;
if (pos.X > winSize.X - 5 && pos.Y > winSize.Y - 5) if (pos.X > winSize.X - distance && pos.Y > winSize.Y - distance)
return WindowHitCodes.BottomRight; return WindowHitCodes.BottomRight;
if (pos.Y < 5 && pos.X < 5) if (pos.Y < distance && pos.X < distance)
return WindowHitCodes.TopLeft; return WindowHitCodes.TopLeft;
if (pos.Y < 5 && pos.X > winSize.X - 5) if (pos.Y < distance && pos.X > winSize.X - distance)
return WindowHitCodes.TopRight; return WindowHitCodes.TopRight;
if (pos.X > winSize.X - 5) if (pos.X > winSize.X - distance)
return WindowHitCodes.Right; return WindowHitCodes.Right;
if (pos.X < 5) if (pos.X < distance)
return WindowHitCodes.Left; return WindowHitCodes.Left;
if (pos.Y < 5) if (pos.Y < distance)
return WindowHitCodes.Top; return WindowHitCodes.Top;
if (pos.Y > winSize.Y - 5) if (pos.Y > winSize.Y - distance)
return WindowHitCodes.Bottom; return WindowHitCodes.Bottom;
} }
var menuPos = PointFromWindow(pos); var menuPos = PointFromWindow(pos);
var controlUnderMouse = GetChildAt(menuPos); var controlUnderMouse = GetChildAt(menuPos);
var isMouseOverSth = controlUnderMouse != null && controlUnderMouse != _title; var isMouseOverSth = controlUnderMouse != null && controlUnderMouse != _title;
if (new Rectangle(Vector2.Zero, Size).Contains(ref menuPos) && !isMouseOverSth) var rb = GetRightButton();
if (rb != null && _minimizeButton != null && new Rectangle(rb.UpperRight * Platform.DpiScale, (_minimizeButton.BottomLeft - rb.UpperRight) * Platform.DpiScale).Contains(ref menuPos) && !isMouseOverSth)
return WindowHitCodes.Caption; return WindowHitCodes.Caption;
return WindowHitCodes.Client; return WindowHitCodes.Client;
} }
/// <summary>
/// Return the rightmost button.
/// </summary>
/// <returns>Rightmost button, null if there is no <see cref="MainMenuButton"/></returns>
private MainMenuButton GetRightButton()
{
MainMenuButton b = null;
foreach (var control in Children)
{
if (b == null && control is MainMenuButton)
b = (MainMenuButton)control;
if (control is MainMenuButton && control.Right > b.Right)
b = (MainMenuButton)control;
}
return b;
}
/// <summary> /// <summary>
/// Adds the button. /// Adds the button.
/// </summary> /// </summary>