From 39491663eed20670af88195c212accd8a875fa08 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Perrier Date: Mon, 21 Dec 2020 17:25:10 +0100 Subject: [PATCH 1/3] Fix flashing tooltip. --- Source/Engine/UI/GUI/Tooltip.cs | 2 +- Source/Engine/UI/GUI/WindowRootControl.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Engine/UI/GUI/Tooltip.cs b/Source/Engine/UI/GUI/Tooltip.cs index 460fddb6f..d0f78227d 100644 --- a/Source/Engine/UI/GUI/Tooltip.cs +++ b/Source/Engine/UI/GUI/Tooltip.cs @@ -194,7 +194,7 @@ namespace FlaxEngine.GUI { // Auto hide if mouse leaves control area Vector2 mousePos = Input.MouseScreenPosition; - Vector2 location = _showTarget.ScreenToClient(mousePos / Platform.DpiScale); + Vector2 location = _showTarget.ScreenToClient(mousePos); if (!_showTarget.OnTestTooltipOverControl(ref location)) { // Mouse left or sth diff --git a/Source/Engine/UI/GUI/WindowRootControl.cs b/Source/Engine/UI/GUI/WindowRootControl.cs index 10e48baa5..eb4e1b85c 100644 --- a/Source/Engine/UI/GUI/WindowRootControl.cs +++ b/Source/Engine/UI/GUI/WindowRootControl.cs @@ -234,7 +234,7 @@ namespace FlaxEngine.GUI /// public override Vector2 ScreenToClient(Vector2 location) { - return _window.ScreenToClient(location); + return _window.ScreenToClient(location) / Platform.DpiScale; } /// From 4a3092d0e82732c457a1820ab5d0257a687cb00f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Perrier Date: Mon, 21 Dec 2020 18:10:38 +0100 Subject: [PATCH 2/3] Fix wrong engine path with RegisterEng. as Admin. --- RegisterEngineLocation.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RegisterEngineLocation.bat b/RegisterEngineLocation.bat index 56ccc496c..7b6f8dae5 100644 --- a/RegisterEngineLocation.bat +++ b/RegisterEngineLocation.bat @@ -3,7 +3,7 @@ rem Copyright (c) 2012-2020 Wojciech Figat. All rights reserved. setlocal -pushd +pushd %~dp0 echo Registering Flax Engine project files... rem Check the current versions config From 965352c3f4f0fb0c9a809961dab5578a71e30741 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Perrier Date: Mon, 21 Dec 2020 18:14:52 +0100 Subject: [PATCH 3/3] Revert "Fix wrong engine path with RegisterEng. as Admin." This reverts commit 4a3092d0e82732c457a1820ab5d0257a687cb00f. --- RegisterEngineLocation.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RegisterEngineLocation.bat b/RegisterEngineLocation.bat index 7b6f8dae5..56ccc496c 100644 --- a/RegisterEngineLocation.bat +++ b/RegisterEngineLocation.bat @@ -3,7 +3,7 @@ rem Copyright (c) 2012-2020 Wojciech Figat. All rights reserved. setlocal -pushd %~dp0 +pushd echo Registering Flax Engine project files... rem Check the current versions config