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

Resize stances panel to fit better and move delete command to end of list.

Browse Source 
This was SVN commit r10199.
This commit is contained in:
WhiteTreePaladin 2011-09-07 01:54:08 +00:00
parent 3f0f1f78fb
commit 550cac253d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/public/gui/session/session.xml
View File

@ -497,10 +497,10 @@
<!-- Stance Selection -->
<object name="unitStancePanel"
style="TranslucentPanel"
size="0 100%-43 100% 100%"
size="4 100%-43 100%-4 100%-4"
type="text"
>
<object size="5 3 100% 100%">
<object size="1 2 100% 100%">
<repeat count="5">
<object name="unitStanceButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
<object name="unitStanceIcon[n]" type="image" ghost="true" size="3 3 33 33"/>

16
binaries/data/mods/public/gui/session/utility_functions.js
View File

@ -3,9 +3,9 @@ const FLORA = "flora";
const FAUNA = "fauna";
const SPECIAL = "special";
//-------------------------------- -------------------------------- --------------------------------
//-------------------------------- -------------------------------- --------------------------------
// Utility functions
//-------------------------------- -------------------------------- --------------------------------
//-------------------------------- -------------------------------- --------------------------------
// Get the basic player data
function getPlayerData(playerAssignments)
@ -35,7 +35,7 @@ function getPlayerData(playerAssignments)
};
players.push(player);
}
// Overwrite default player names with multiplayer names
if (playerAssignments)
{
@ -49,7 +49,7 @@ function getPlayerData(playerAssignments)
}
}
}
return players;
}
@ -137,14 +137,14 @@ function damageTypesToText(dmg)
{
if (!dmg)
return "[font=\"serif-12\"](None)[/font]";
var hackLabel = "[font=\"serif-12\"] Hack[/font]";
var pierceLabel = "[font=\"serif-12\"] Pierce[/font]";
var crushLabel = "[font=\"serif-12\"] Crush[/font]";
var hackDamage = dmg.hack;
var pierceDamage = dmg.pierce;
var crushDamage = dmg.crush;
var dmgArray = [];
if (hackDamage) dmgArray.push(hackDamage + hackLabel);
if (pierceDamage) dmgArray.push(pierceDamage + pierceLabel);
@ -234,11 +234,11 @@ function getEntityCommandsList(entState)
var commands = [];
if (entState.garrisonHolder)
commands.push("unload-all");
commands.push("delete");
if (isUnit(entState))
commands.push("garrison");
if (entState.buildEntities)
commands.push("repair");
commands.push("delete");
return commands;
}
@ -279,7 +279,7 @@ function getEntityNameWithGenericType(template)
name = template.name.specific + " (" + template.name.generic + ")";
else
name = template.name.specific || template.name.generic || "???";
return "[font=\"serif-bold-16\"]" + name + "[/font]";
}