From be3ca61d43edb8a6795114940ca6bc4661ab3dad Mon Sep 17 00:00:00 2001
From: Deiz <deiz@wildfiregames.com>
Date: Tue, 31 Jul 2012 03:37:04 +0000
Subject: [PATCH] Updated the production queue buttons, putting the progress
 sliders inside the button border.

This was SVN commit r12245.
---
 binaries/data/mods/public/gui/session/session.xml      | 2 +-
 binaries/data/mods/public/gui/session/unit_commands.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/binaries/data/mods/public/gui/session/session.xml b/binaries/data/mods/public/gui/session/session.xml
index be2fbeb013..7d0eb23c41 100644
--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@@ -863,7 +863,7 @@
 			<repeat count="16">
 			    <object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
 				<object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
-				<object name="unitQueueProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="1 1 100%-1 100%-1" z="20"/>
+				<object name="unitQueueProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37" z="20"/>
 				<object name="unitQueueCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
 			    </object>
 			</repeat>
diff --git a/binaries/data/mods/public/gui/session/unit_commands.js b/binaries/data/mods/public/gui/session/unit_commands.js
index 01a3dfea6e..18acc79cbe 100644
--- a/binaries/data/mods/public/gui/session/unit_commands.js
+++ b/binaries/data/mods/public/gui/session/unit_commands.js
@@ -315,7 +315,9 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
 				{
 					getGUIObjectByName("queueProgress").caption = (item.progress ? progress : "");
 					var size = getGUIObjectByName("unit"+guiName+"ProgressSlider["+i+"]").size;
-					size.top = Math.round(item.progress*40);
+
+					// Buttons are assumed to be square, so left/right offsets can be used for top/bottom.
+					size.top = size.left + Math.round(item.progress * (size.right - size.left));
 					getGUIObjectByName("unit"+guiName+"ProgressSlider["+i+"]").size = size;
 				}
 				break;