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

Made unit selection icons the same size as the formation icons

Browse Source 
This was SVN commit r8291.
This commit is contained in:
WhiteTreePaladin 2010-10-05 22:44:32 +00:00
parent f05e403ee5
commit ff8477c339
2 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
binaries/data/mods/public/gui/session_new/session.xml
View File

@ -454,20 +454,6 @@
size="50%-114 100%-205 50%+114 100%"
hidden="true"
>
<!-- Unit details for Single Unit -->
<object size="50%-112 0 50%+112 100%" name="detailsAreaSingle">
@ -518,19 +504,16 @@
<object size="0 142 100% 162" name="specific" type="text" style="largeCenteredOutlinedText" tooltip_style="snToolTip"/>
</object>
<!-- Unit details for Multiplle Units -->
<object size="50%-112 0 50%+112 100%" name="detailsAreaMultiple">
<object name="unitSelectionPanel"
size="20 16 100%-20 100%"
size="35 10 100%-20 100%"
>
<object size="0 0 100% 100%">
<repeat count="15">
<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" z="100">
<object name="unitSelectionIcon[n]" type="image" ghost="true" size="1 1 35 35"/>
<repeat count="12">
<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" z="100">
<object name="unitSelectionIcon[n]" type="image" ghost="true" size="1 1 37 37"/>
<object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
<object size="0 100%-3 100% 100%" name="unitSelectionHealth[n]" ghost="true">
</object>
@ -539,9 +522,8 @@
</object>
</object>
<!-- Stats Bars -->
<object size= "40 100%-65 100%-40 100%-35" type="image" tooltip_style="snToolTip">
<object size= "55 100%-70 100%-55 100%-40" type="image" tooltip_style="snToolTip">
<!-- Health bar -->
<object size="0 0 100% 12" type="image" name="healthMultiple" tooltip="Hitpoints" tooltip_style="snToolTip">
<object type="image" sprite="healthBackground" ghost="true"/>
@ -559,11 +541,6 @@
</object>
<!-- Unit Commands -->
<object name="unitCommandPanel"
size="0 100%-35 100% 100%"

6
binaries/data/mods/public/gui/session_new/unit_commands.js
View File

@ -117,8 +117,8 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
if (guiName == "Selection")
{
if (numberOfItems > 15)
numberOfItems = 15;
if (numberOfItems > 12)
numberOfItems = 12;
}
if (guiName == "Formation" || guiName == "Garrison")
{
@ -250,7 +250,7 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
var rowLength = 8;
if (guiName == "Selection")
rowLength = 5;
rowLength = 4;
else if (guiName == "Formation" || guiName == "Garrison" || guiName == "Command")
rowLength = 4;