Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Show correct action cursor over minimap

Browse Source 
Refs: #1847
Differential Revision: https://code.wildfiregames.com/D2718
This was SVN commit r23619.
This commit is contained in:
Imarok 2020-05-03 10:32:33 +00:00
parent 2e6aecb210
commit 9306d84905
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
binaries/data/mods/public/gui/session/input.js
View File

@ -88,9 +88,9 @@ function updateCursorAndTooltip()
var cursorSet = false;
var tooltipSet = false;
var informationTooltip = Engine.GetGUIObjectByName("informationTooltip");
if (!mouseIsOverObject && (inputState == INPUT_NORMAL || inputState == INPUT_PRESELECTEDACTION))
if (!mouseIsOverObject && (inputState == INPUT_NORMAL || inputState == INPUT_PRESELECTEDACTION) || g_MiniMapPanel.isMouseOverMiniMap())
{
let action = determineAction(mouseX, mouseY);
let action = determineAction(mouseX, mouseY, g_MiniMapPanel.isMouseOverMiniMap());
if (action)
{
if (action.cursor)
@ -239,7 +239,9 @@ function determineAction(x, y, fromMiniMap)
// thus the most specific should appear first.
let actionInfo = undefined;
if (preSelectedAction != ACTION_NONE)
// Disable preselected actions on the minimap because their
// left-click interferes with the minimap left-click anyways.
if (preSelectedAction != ACTION_NONE && !fromMiniMap)
{
for (let action of g_UnitActionsSortedKeys)
if (g_UnitActions[action].preSelectedActionCheck)

18
binaries/data/mods/public/gui/session/minimap/MiniMap.js
View File

@ -7,6 +7,9 @@ class MiniMap
constructor()
{
Engine.GetGUIObjectByName("minimap").onWorldClick = this.onWorldClick.bind(this);
Engine.GetGUIObjectByName("minimap").onMouseEnter = this.onMouseEnter.bind(this);
Engine.GetGUIObjectByName("minimap").onMouseLeave = this.onMouseLeave.bind(this);
this.mouseIsOverMiniMap = false;
}
onWorldClick(target)
@ -23,4 +26,19 @@ class MiniMap
let action = determineAction(undefined, undefined, true);
return action && handleUnitAction(target, action);
}
onMouseEnter()
{
this.mouseIsOverMiniMap = true;
}
onMouseLeave()
{
this.mouseIsOverMiniMap = false;
}
isMouseOverMiniMap()
{
return this.mouseIsOverMiniMap;
}
}

5
binaries/data/mods/public/gui/session/minimap/MiniMapPanel.js
View File

@ -9,4 +9,9 @@ class MiniMapPanel
this.idleWorkerButton = new MiniMapIdleWorkerButton(playerViewControl, idleWorkerClasses);
this.miniMap = new MiniMap();
}
isMouseOverMiniMap()
{
return this.miniMap.isMouseOverMiniMap();
}
}