Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'fix-dpi-issues' of git://github.com/stefnotch/FlaxEngine into stefnotch-fix-dpi-issues

Browse Source
This commit is contained in:
Wojciech Figat
2020-12-23 22:37:12 +01:00
parent 87e026bd4f 0679aebfac
commit 05b358f44e
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Editor/GUI/ContextMenu/ContextMenuBase.cs
+1 -1
View File
@@ -303,7 +303,7 @@ namespace FlaxEditor.GUI.ContextMenu
if (_parentCM != null)
{
// Focus parent if user clicked over the parent popup
var mouse = _parentCM.ScreenToClient(FlaxEngine.Input.MouseScreenPosition / Platform.DpiScale);
var mouse = _parentCM.ScreenToClient(FlaxEngine.Input.MouseScreenPosition);
if (_parentCM.ContainsPoint(ref mouse))
{
_parentCM._window.Focus();
Source/Editor/GUI/Docking/DockHintWindow.cs
+1 -2
View File
@@ -223,8 +223,7 @@ namespace FlaxEditor.GUI.Docking
_mouse = FlaxEngine.Input.MouseScreenPosition;
// Check intersection with any dock panel
var dpiScale = Platform.DpiScale;
var uiMouse = _mouse / dpiScale;
var uiMouse = _mouse;
_toDock = _toMove.MasterPanel.HitTest(ref uiMouse, _toMove);
// Check dock state to use