From 2dde452493477041e45cc350b4ba3abec82022a3 Mon Sep 17 00:00:00 2001
From: freenity <freenity@wildfiregames.com>
Date: Tue, 29 Jul 2008 14:26:27 +0000
Subject: [PATCH] Fixing the players list. Adding the shadow, correcting the
 order.

This was SVN commit r6292.
---
 .../data/mods/official/gui/test/4_session.xml | 83 ++++++++++++++++++-
 .../gui/test/functions_page_session.js        | 18 +++-
 .../data/mods/official/gui/test/styles.xml    | 20 ++++-
 3 files changed, 112 insertions(+), 9 deletions(-)

diff --git a/binaries/data/mods/official/gui/test/4_session.xml b/binaries/data/mods/official/gui/test/4_session.xml
index 0922ea7ed8..640e82acc0 100644
--- a/binaries/data/mods/official/gui/test/4_session.xml
+++ b/binaries/data/mods/official/gui/test/4_session.xml
@@ -84,6 +84,16 @@
 				toggleTerritoryRendering();
 			]]></action>
 		</object>
+    
+    <!-- EMPTY OBJECT USED TO KILL UNITS -->
+    <object name="unitsKiller"
+            hotkey="killUnit"
+    >
+      <action on="Press"><![CDATA[
+        killUnit();
+      ]]>  
+      </action>
+    </object>
 		
 		<!-- GROUP: MINIMAP -->
 		<object	name="snMiniMap"
@@ -354,7 +364,73 @@
 		        style="globalMessageStyle"
 		>
 		</object>
-		
+
+    //Shadow
+    <object name="PlayersListShadow"
+      type="text"
+      style="PlayersListStyleShadow"
+		>
+
+      <object name="PlayerShadow_1"
+              type="text"
+              style="PlayerStyleShadow"
+           >
+      </object>
+
+      <object name="PlayerShadow_2"
+                 type="text"
+                 style="PlayerStyleShadow"
+           >
+      </object>
+
+      <object name="PlayerShadow_3"
+             type="text"
+             style="PlayerStyleShadow"
+           >
+      </object>
+
+
+      <object name="PlayerShadow_4"
+             type="text"
+             style="PlayerStyleShadow"
+           >
+      </object>
+
+      <object name="PlayerShadow_5"
+             type="text"
+             style="PlayerStyleShadow"
+           >
+      </object>
+
+      <object name="PlayerShadow_6"
+             type="text"
+             style="PlayerStyleShadow"
+           >
+      </object>
+
+      <object name="PlayerShadow_7"
+             type="text"
+             style="PlayerStyleShadow"
+           >
+      </object>
+
+      <object name="PlayerShadow_8"
+             type="text"
+             style="PlayerStyleShadow"
+           >
+        <action on="Load">
+          <![CDATA[ 
+                    //Sets correct coordinates for each text object.
+                    for (var i=1; i<=8; i++)
+                    {
+                        addCrds("PlayerShadow_"+i, 0, 0, 0, i*14+1, 1, 0, 100, 100);
+                    }
+                    
+               ]]>
+        </action>
+      </object>
+
+    </object>
 		
 		<!-- Players list -->
 		<object name="PlayersList"
@@ -370,21 +446,18 @@
 		  <object name="Player_1"
 		          type="text"
 		          style="PlayerStyle"
-		          size="0% 0% 100% 100%"
            >
 		   </object> 
 		  
 		   <object name="Player_2"
                   type="text"
                   style="PlayerStyle"
-                  size="0% 0%+14 100% 100%"
            >
            </object> 
           
            <object name="Player_3"
                   type="text"
                   style="PlayerStyle"
-                  size="0% 0%+28 100% 100%"
            >
            </object> 
            
@@ -428,6 +501,8 @@
            </object> 
 		  
 		</object>
+
+    
 		
 		<!-- GROUP: STATUS PANE -->
 		<object	name="snStatusPane"
diff --git a/binaries/data/mods/official/gui/test/functions_page_session.js b/binaries/data/mods/official/gui/test/functions_page_session.js
index eba448e6ca..6b20160f00 100644
--- a/binaries/data/mods/official/gui/test/functions_page_session.js
+++ b/binaries/data/mods/official/gui/test/functions_page_session.js
@@ -387,22 +387,32 @@ function togglePlayersList()
 	if (!playersList_init) 
 	{
 		playersList_init = true;
-                    
-        for (var i=1; i<=8; i++)
+		var trueLength = 0;
+		
+		for (var i=1; i<players.length-1; i++)
+		{
+			if (players[i].active)
+				trueLength++;
+		}
+		
+        for (var i=1; i<=trueLength; i++)
         {
             if (players[i].active)
             {
-            	getGUIObjectByName("Player_" + (8-i+1)).caption = players[i].name;
+            	getGUIObjectByName("Player_" + (i+8-trueLength)).caption = players[i].name;
+            	getGUIObjectByName("PlayerShadow_" + (i+8-trueLength)).caption = players[i].name;
                             
             	var col_r = parseInt(players[i].getColour().r * 255);
             	var col_g = parseInt(players[i].getColour().g * 255);
             	var col_b = parseInt(players[i].getColour().b * 255);
                             
-            	getGUIObjectByName("Player_" + (8-i+1)).textcolor = col_r + " " + col_g + " " + col_b;
+            	getGUIObjectByName("Player_" + (i+8-trueLength)).textcolor = col_r + " " + col_g + " " + col_b;
             }
         }
 	}
 	
 	 var pl = getGUIObjectByName("PlayersList");
      pl.hidden = ! pl.hidden;
+     var pls = getGUIObjectByName("PlayersListShadow");
+     pls.hidden = ! pls.hidden;
 }
\ No newline at end of file
diff --git a/binaries/data/mods/official/gui/test/styles.xml b/binaries/data/mods/official/gui/test/styles.xml
index 511fcb91f9..e591f257f5 100755
--- a/binaries/data/mods/official/gui/test/styles.xml
+++ b/binaries/data/mods/official/gui/test/styles.xml
@@ -799,7 +799,17 @@ NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET
     text_valign="bottom"
     textcolor="white"
     ghost="true"
-    font="trebuchet14"
+    font="trebuchet14b"
+    size="100%-500 100%-320 100% 100%-180"
+  />
+
+  <style name="PlayersListStyleShadow"
+    hidden="true"
+    text_align="right"
+    text_valign="bottom"
+    textcolor="50 50 50"
+    ghost="true"
+    font="trebuchet14b"
     size="100%-500 100%-320 100% 100%-180"
   />
   
@@ -807,6 +817,14 @@ NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET
     ghost="true"
     textcolor="white"
     text_align="right"
+    font="trebuchet14b"
+  />
+
+  <style name="PlayerStyleShadow"
+    ghost="true"
+    textcolor="50 50 50"
+    text_align="right"
+    font="trebuchet14b"
   />
 
 </styles>