Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Fix progress slider on formerly autoqueued items.

Browse Source 
It was not resized for ghosts.

Reported by: @Langbart
Differential revision: https://code.wildfiregames.com/D4592
Fixes #6492

This was SVN commit r26769.
This commit is contained in:
Freagarach 2022-04-09 05:34:43 +00:00
parent 41032b034c
commit 06796303d7
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
binaries/data/mods/public/gui/session/selection_panels.js
View File

@ -569,10 +569,16 @@ g_SelectionPanels.Queue = {
data.countDisplay.caption = queuedItem.count > 1 ? queuedItem.count : "";
const progressSlider = Engine.GetGUIObjectByName("unitQueueProgressSlider[" + data.i + "]");
if (data.item.ghost)
{
data.button.enabled = false;
Engine.GetGUIObjectByName("unitQueueProgressSlider[" + data.i + "]").sprite="color:0 150 250 50";
progressSlider.sprite="color:0 150 250 50";
const size = progressSlider.size;
// Buttons are assumed to be square, so left/right offsets can be used for top/bottom.
size.top = size.left;
progressSlider.size = size;
}
else
{
@ -581,13 +587,12 @@ g_SelectionPanels.Queue = {
Engine.GetGUIObjectByName("queueTimeRemaining").caption =
Engine.FormatMillisecondsIntoDateStringGMT(queuedItem.timeRemaining, translateWithContext("countdown format", "m:ss"));
const guiObject = Engine.GetGUIObjectByName("unitQueueProgressSlider[" + data.i + "]");
guiObject.sprite = "queueProgressSlider";
const size = guiObject.size;
progressSlider.sprite = "queueProgressSlider";
const size = progressSlider.size;
// Buttons are assumed to be square, so left/right offsets can be used for top/bottom.
size.top = size.left + Math.round(queuedItem.progress * (size.right - size.left));
guiObject.size = size;
progressSlider.size = size;
data.button.enabled = controlsPlayer(data.player);