From 28c6bc2fbbb7af1ef0cb2c76dfcd7872a55d7407 Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Sat, 18 Mar 2006 17:42:37 +0000
Subject: [PATCH] * Minimap buttons are in place and clickable (though not
 actually hooked up with any events yet). The arc buttons still don't look
 quite right, but artist intervention will no doubt set me right.

This was SVN commit r3663.
---
 .../data/mods/official/gui/test/4_session.xml | 221 ++++++++++--------
 .../data/mods/official/gui/test/sprite1.xml   |  14 +-
 .../data/mods/official/gui/test/styles.xml    |  12 +
 3 files changed, 152 insertions(+), 95 deletions(-)

diff --git a/binaries/data/mods/official/gui/test/4_session.xml b/binaries/data/mods/official/gui/test/4_session.xml
index 7502a59df0..133cf647dd 100644
--- a/binaries/data/mods/official/gui/test/4_session.xml
+++ b/binaries/data/mods/official/gui/test/4_session.xml
@@ -76,7 +76,7 @@
 				type="minimap"
 			>
 				<action on="Load"><![CDATA[
-					addCrds (this.name, 100, 100, 5, 5, 150, 150);
+					addCrds (this.name, 100, 100, 6, 6, 132, 132);
 				]]></action>
 			</object>			
 			
@@ -85,105 +85,138 @@
 				type="image"
 			>
 				<action on="Load"><![CDATA[
-					addCrds (this.name, 100, 100, 0, 0, 192, 192);
+					addCrds (this.name, 100, 100, 0, 0, 172, 172);
 				]]></action>
 				
-					<object name="snMiniMapButtonGroup" ghost="false"
-					>
-						<object	name="snMiniMapButtonArc_Up" style="snMiniMapArcUp" type="button"
-						>
-							<action on="Load"><![CDATA[
-								addCrds (this.name, 0, 0, 6, 32, 40, 80);
-							]]></action>				
-						</object>
-						<object	name="snMiniMapButtonArc_Left" style="snMiniMapArcLeft" type="button"
-						>
-							<action on="Load"><![CDATA[
-								addCrds (this.name, 0, 0, 32, 6, 80, 40);
-							]]></action>				
-						</object>				
-						<object	name="snMiniMapButtonUp_1" style="snStat" type="button" />
-						<object	name="snMiniMapButtonUp_2" style="snStat" type="button" />
-						<object	name="snMiniMapButtonUp_3" style="snStat" type="button"
-						>
-							<action on="Load"><![CDATA[
-								// Seek through this group of buttons (determining length from last object's name).
-								max = this.name.substring (this.name.lastIndexOf ("_")+1, this.name.length);
-								for (loop = 1; loop <= max; loop++)
-								{
-									tempName = this.name.substring (0, this.name.lastIndexOf ("_")+1) + loop;
-									// Set size/position.
-									if (loop == 1)
-									{
-										currCrd = getCrd ("snMiniMapBorder");									
-										addCrds (tempName,
-											100, 100,
-											0,
-											currCrd.coord[rb].y,
-											40,
-											40);									
-									}
-									else
-									{
-										currCrd = getCrd (this.name.substring (0, this.name.lastIndexOf ("_")+1) + (loop - 1));
-										addCrds (tempName,
-											100, 100,
-											0,
-											currCrd.coord[rb].y+currCrd.coord[rb].height,
-											currCrd.coord[rb].width,
-											currCrd.coord[rb].height);
-									}
-									// Set object properties.
-									tempObject = getGUIObjectByName (tempName);
-									switch (loop)
-									{
-										case 1:
-											tempObject.cell_id = cellGroup["Minimap"]["territories"].id;
-										break;
-										case 2:
-											tempObject.cell_id = cellGroup["Minimap"]["terrain"].id;
-										break;
-										case 3:
-											tempObject.cell_id = cellGroup["Minimap"]["chat"].id;
-										break;
-										default:
-										break;
-									}
-									tempObject.sprite = "snIconSheetMiniMapButton";
-									tempObject.sprite_over = "snIconSheetMiniMapButtonOver";
-									tempObject.sprite_disabled = "snIconSheetMiniMapButtonDisabled";
-									// Set tooltip.
-									tempObject.tooltip = "This button doesn't do anything ... yet.";
-									
-								}
-							]]></action>
-						</object>				
-						<object	name="snMiniMapButtonLeft_1" style="snStat" type="button" />
-						<object	name="snMiniMapButtonLeft_2" style="snStat" type="button" />
-						<object	name="snMiniMapButtonLeft_3" style="snStat" type="button"
-						>
-							<action on="Load"><![CDATA[
-								// Seek through this group of buttons (determining length from last object's name).
-								max = this.name.substring (this.name.lastIndexOf ("_")+1, this.name.length);
-								for (loop = 1; loop <= max; loop++)
-								{
-									tempName = this.name.substring (0, this.name.lastIndexOf ("_")+1) + loop;
-									// Set size/position.
-									addCrds (tempName,
-										100, 100, 0,
-										getCrd ("snMiniMapButtonArc_Left").coord[rb].y+(getCrd ("snMiniMapButtonArc_Left").coord[rb].height/max)*(loop-1),
-										getCrd ("snMiniMapButtonArc_Left").coord[rb].width,
-										getCrd ("snMiniMapButtonArc_Left").coord[rb].height/max);
-									// Set tooltip.
-									getGUIObjectByName (tempName).tooltip = "This button doesn't do anything ... yet.";
-								}
-							]]></action>
-						</object>
-					</object>
 				
 			</object>
 
 		</object>
+		
+		<object name="snMiniMapButtonGroup"
+		>
+			<object	name="snMiniMapButtonArc_Up" style="snMiniMapArcUp" type="button"
+			>
+				<action on="Load"><![CDATA[
+					currCrd = getCrd ("snMiniMapBorder");
+					addCrds (this.name, 100, 100, currCrd.coord[rb].x+currCrd.coord[rb].width-32, currCrd.coord[rb].y+currCrd.coord[rb].height-83, 25, 52);
+				]]></action>				
+			</object>
+			<object	name="snMiniMapButtonArc_Left" style="snMiniMapArcLeft" type="button"
+			>
+				<action on="Load"><![CDATA[
+					currCrd = getCrd ("snMiniMapBorder");
+					addCrds (this.name, 100, 100, currCrd.coord[rb].x+currCrd.coord[rb].width-83, currCrd.coord[rb].y+currCrd.coord[rb].height-32, 52, 25);
+				]]></action>				
+			</object>				
+			<object	name="snMiniMapButtonUp_1" style="snMiniMapButton" type="button" />
+			<object	name="snMiniMapButtonUp_2" style="snMiniMapButton" type="button" />
+			<object	name="snMiniMapButtonUp_3" style="snMiniMapButton" type="button"
+			>
+				<action on="Load"><![CDATA[
+					// Seek through this group of buttons (determining length from last object's name).
+					max = this.name.substring (this.name.lastIndexOf ("_")+1, this.name.length);
+					for (loop = 1; loop <= max; loop++)
+					{
+						tempName = this.name.substring (0, this.name.lastIndexOf ("_")+1) + loop;
+						// Set size/position.
+						if (loop == 1)
+						{
+							currCrd = getCrd ("snMiniMapBorder");									
+							addCrds (tempName,
+								100, 100,
+								currCrd.coord[rb].x+currCrd.coord[rb].width-35,
+								currCrd.coord[rb].y,
+								30,
+								30);									
+						}
+						else
+						{
+							currCrd = getCrd (this.name.substring (0, this.name.lastIndexOf ("_")+1) + (loop - 1));
+							addCrds (tempName,
+								100, 100,
+								currCrd.coord[rb].x,
+								currCrd.coord[rb].y+currCrd.coord[rb].height+1,
+								currCrd.coord[rb].width,
+								currCrd.coord[rb].height);
+						}
+						// Set object properties.
+						tempObject = getGUIObjectByName (tempName);
+						switch (loop)
+						{
+							case 1:
+								tempObject.cell_id = cellGroup["Minimap"]["territories"].id;
+							break;
+							case 2:
+								tempObject.cell_id = cellGroup["Minimap"]["terrain"].id;
+							break;
+							case 3:
+								tempObject.cell_id = cellGroup["Minimap"]["chat"].id;
+							break;
+							default:
+							break;
+						}
+						// Set tooltip.
+						tempObject.tooltip = "This button doesn't do anything ... yet.";
+						
+					}
+				]]></action>
+			</object>				
+			<object	name="snMiniMapButtonLeft_1" style="snMiniMapButton" type="button" />
+			<object	name="snMiniMapButtonLeft_2" style="snMiniMapButton" type="button" />
+			<object	name="snMiniMapButtonLeft_3" style="snMiniMapButton" type="button"
+			>
+				<action on="Load"><![CDATA[
+					// Seek through this group of buttons (determining length from last object's name).
+					max = this.name.substring (this.name.lastIndexOf ("_")+1, this.name.length);
+					for (loop = 1; loop <= max; loop++)
+					{
+						tempName = this.name.substring (0, this.name.lastIndexOf ("_")+1) + loop;
+						// Set size/position.
+						if (loop == 1)
+						{
+							currCrd = getCrd ("snMiniMapBorder");									
+							addCrds (tempName,
+								100, 100,
+								currCrd.coord[rb].x,
+								currCrd.coord[rb].y+currCrd.coord[rb].height-32,
+								30,
+								30);									
+						}
+						else
+						{
+							currCrd = getCrd (this.name.substring (0, this.name.lastIndexOf ("_")+1) + (loop - 1));
+							addCrds (tempName,
+								100, 100,
+								currCrd.coord[rb].x+currCrd.coord[rb].width+1,
+								currCrd.coord[rb].y,
+								currCrd.coord[rb].width,
+								currCrd.coord[rb].height);
+						}
+						// Set object properties.
+						tempObject = getGUIObjectByName (tempName);
+						switch (loop)
+						{
+							case 1:
+								tempObject.cell_id = cellGroup["Minimap"]["score"].id;
+							break;
+							case 2:
+								tempObject.cell_id = cellGroup["Minimap"]["cycleobjects"].id;
+							break;
+							case 3:
+								tempObject.cell_id = cellGroup["Minimap"]["friendorfoe"].id;
+							break;
+							default:
+							break;
+						}
+						// Set tooltip.
+						tempObject.tooltip = "This button doesn't do anything ... yet.";
+						
+					}
+				]]></action>
+			</object>
+		</object>
+		
 
 		<!-- GROUP: RESOURCE COUNTER -->
 		<object name="snResourceCounter"
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index df836ce9e8..bb61e3810d 100644
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -786,7 +786,7 @@
 					real_texture_placement="0 0 174 172"
 					size="0 0 100% 100%"
 			/>
-		</sprite>		
+		</sprite>	
 
 		<!--
 		==========================================
@@ -873,27 +873,33 @@
 			<!-- Arc Left (minimap top). -->
 			<sprite	name="snIconArcLeft">
 				<image	texture="session/icons/bkg/arc_left.dds"
+						real_texture_placement="0 0 48 24"
 						size="0 0 100% 100%" 
 				/>
 				<image	texture="session/icons/single/idle.dds"
+						real_texture_placement="0 0 48 24"				
 						size="0 0 100% 100%" 
 				/>				
 			</sprite>
 			<sprite	name="snIconArcLeftOver">
 				<effect	add_color="42 42 42 0"/>
 				<image	texture="session/icons/bkg/arc_left.dds"
+						real_texture_placement="0 0 48 24"				
 						size="0 0 100% 100%" 
 				/>
 				<image	texture="session/icons/single/idle.dds"
+						real_texture_placement="0 0 48 24"				
 						size="0 0 100% 100%" 
 				/>				
 			</sprite>
 			<sprite	name="snIconArcLeftDisabled">
 				<effect	grayscale=""/>
 				<image	texture="session/icons/bkg/arc_left.dds"
+						real_texture_placement="0 0 48 24"				
 						size="0 0 100% 100%" 
 				/>
 				<image	texture="session/icons/single/idle.dds"
+						real_texture_placement="0 0 48 24"				
 						size="0 0 100% 100%" 
 				/>				
 			</sprite>			
@@ -901,27 +907,33 @@
 			<!-- Arc Up (minimap left). -->
 			<sprite	name="snIconArcUp">
 				<image	texture="session/icons/bkg/arc_up.dds"
+						real_texture_placement="0 0 24 48"
 						size="0 0 100% 100%" 
 				/>
 				<image	texture="session/icons/single/flare.dds"
+						real_texture_placement="0 0 24 48"				
 						size="0 0 100% 100%" 
 				/>				
 			</sprite>
 			<sprite	name="snIconArcUpOver">
 				<effect	add_color="42 42 42 0"/>
 				<image	texture="session/icons/bkg/arc_up.dds"
+						real_texture_placement="0 0 24 48"				
 						size="0 0 100% 100%" 
 				/>
 				<image	texture="session/icons/single/flare.dds"
+						real_texture_placement="0 0 24 48"				
 						size="0 0 100% 100%" 
 				/>				
 			</sprite>
 			<sprite	name="snIconArcUpDisabled">
 				<effect	grayscale=""/>
 				<image	texture="session/icons/bkg/arc_up.dds"
+						real_texture_placement="0 0 24 48"				
 						size="0 0 100% 100%" 
 				/>
 				<image	texture="session/icons/single/flare.dds"
+						real_texture_placement="0 0 24 48"				
 						size="0 0 100% 100%" 
 				/>				
 			</sprite>			
diff --git a/binaries/data/mods/official/gui/test/styles.xml b/binaries/data/mods/official/gui/test/styles.xml
index eab11c951e..3d63358b7c 100755
--- a/binaries/data/mods/official/gui/test/styles.xml
+++ b/binaries/data/mods/official/gui/test/styles.xml
@@ -545,6 +545,18 @@
 				ghost="false"				
 		/>		
 		
+		<style	name="snMiniMapButton"
+				text_align="left"
+				text_valign="center"
+				font="tahoma14"
+				textcolor="white"
+				tooltip_style="snToolTip"
+				sprite="snIconSheetMiniMapButton"
+				sprite_over="snIconSheetMiniMapButtonOver"
+				sprite_disabled="snIconSheetMiniMapButtonDisabled"
+				ghost="false"				
+		/>		
+		
 		<style name="snGreenBar"
 			sprite_background=""
 			sprite_bar="bkGreenBar"