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

Cut off panel on right side at 1024 for wide resolutions

Browse Source 
Larger selection icons (Max of 16 now instead of 18)

This was SVN commit r7643.
This commit is contained in:
WhiteTreePaladin 2010-06-28 00:31:24 +00:00
parent e15f6120b1
commit 21b1f1c965
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
binaries/data/mods/public/gui/session_new/session.js
View File

@ -252,13 +252,13 @@ function hideCommands(booleanValue)
// Multiple Selection Layout
function selectionLayoutMultiple()
{
getGUIObjectByName("selectionDetailsMainText").size = "74 100%-70 100%-6 100%-10";
getGUIObjectByName("selectionDetailsMainText").size = "70 100%-70 100%-2 100%-10";
getGUIObjectByName("selectionDetailsSpecific").size = "0 0 100% 24";
getGUIObjectByName("selectionDetailsPlayer").size = "0 30 100% 50";
getGUIObjectByName("selectionDetailsIcon").size = "2 100%-74 58 100%-18";
getGUIObjectByName("selectionDetailsHealth").size = "2 100%-16 58 100%-12";
getGUIObjectByName("selectionDetailsStamina").size = "2 100%-10 58 100%-6";
getGUIObjectByName("selectionDetailsIcon").size = "0 100%-74 56 100%-18";
getGUIObjectByName("selectionDetailsHealth").size = "0 100%-16 56 100%-12";
getGUIObjectByName("selectionDetailsStamina").size = "0 100%-10 56 100%-6";
getGUIObjectByName("selectionDetailsAttack").hidden = true;
getGUIObjectByName("selectionDetailsArmour").hidden = true;
@ -301,12 +301,9 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
usedPanels[guiName] = 1;
var i = 0;
// End loop early if more than 18 selection buttons or more than 16 other types of buttons
var MAX_NUM_BUTTONS = ((guiName == "Selection")? 17 : 15 );
for each (var item in items)
{
if (i > MAX_NUM_BUTTONS)
if (i > 15) // End loop early if more than 16 buttons
break;
// Get templates
@ -396,18 +393,18 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
if (guiName == "Selection") // Smaller Icons
{
if (i > 8) // Make first row
if (i > 7) // Make first row
{
size.left = 30*j;
size.right = 30*j + buttonSideLength;
size.top = 30;
size.bottom = 30 + buttonSideLength;
size.left = 35*j;
size.right = 35*j + buttonSideLength;
size.top = 35;
size.bottom = 35 + buttonSideLength;
j++;
}
else // Make second row
{
size.left = 30*i;
size.right = 30*i + size.bottom;
size.left = 35*i;
size.right = 35*i + size.bottom;
}
}
else // Larger Icons

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

@ -307,14 +307,12 @@
<!-- Unit Selection Area -->
<object name="unitSelectionPanel"
size="-2 -4 278 64"
type="image"
style="goldPanel"
>
<object size="6 6 100% 47">
<object size="1 1 100% 47">
<repeat count="18">
<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 27 27" z="20">
<object name="unitSelectionHighlight[n]" hidden="true" ghost="true" type="image" sprite="primaryGroupHighlight" size="-1 -1 28 28"/>
<object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 25 25"/>
<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" z="20">
<object name="unitSelectionHighlight[n]" hidden="true" ghost="true" type="image" sprite="primaryGroupHighlight" size="-1 -1 33 33"/>
<object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 30 30"/>
<object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text"/>
</object>
</repeat>
@ -365,14 +363,14 @@
<object name="unitCommands"
type="image"
style="wheatWindow"
size="610 100%-144 100% 100%"
size="610 100%-144 1024 100%"
hidden="true"
z="0"
>
<object name="bronzeSquares"
type="image"
sprite="bronzeSquare"
size="50 0 100% 100%"
size="50 0 100%-5 100%"
/>
<object name="unitConstructionPanel"