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

Added third row of buttons to layout

Browse Source 
This was SVN commit r7679.
This commit is contained in:
WhiteTreePaladin 2010-07-03 16:51:20 +00:00
parent d98b0c21b4
commit 065f0deea3
2 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,7 +285,7 @@
size="10 4 278 64"
>
<object size="0 0 100% 47">
<repeat count="18">
<repeat count="24">
<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 34 34" z="20">
<object name="unitSelectionHighlight[n]" hidden="true" ghost="true" type="image" sprite="primaryGroupHighlight" size="-1 -1 35 35"/>
<object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 32 32"/>
@ -365,8 +365,8 @@
<object size="-2 -6 54 50" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip"
cell_id="0" tooltip="Construction"/>
<object size="56 0 100% 37">
<repeat count="16">
<object size="55 0 100% 37">
<repeat count="24">
<object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 43 43">
<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 40 40"/>
</object>
@ -413,8 +413,8 @@
<object size="-2 -6 54 50" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip"
cell_id="2" tooltip="Training"/>
<object size="56 0 100% 37">
<repeat count="16">
<object size="55 0 100% 37">
<repeat count="24">
<object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 43 43">
<object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 40 40"/>
</object>
@ -430,8 +430,8 @@
<object size="-2 -3 54 53" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip"
cell_id="3" tooltip="Production queue"/>
<object size="56 3 100% 37">
<repeat count="16">
<object size="55 3 100% 37">
<repeat count="24">
<object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 43 43">
<object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 40 40"/>
<object name="unitQueueCount[n]" ghost="true" style="iconButtonCount" type="text"/>

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

@ -4,6 +4,26 @@ var g_unitPanelButtons = { "Construction": 0, "Training": 0, "Queue": 0 };
// Unit panels are panels with row(s) of buttons
var g_unitPanels = ["Stance", "Formation", "Construction", "Research", "Training", "Queue", "Selection"];
// Lay out button rows
function layoutButtonRow(rowNumber, guiName, buttonSideLength, buttonSpacer, startIndex, endIndex)
{
var rowIndex = 0;
for (i = startIndex; i < endIndex; i++)
{
var button = getGUIObjectByName("unit"+guiName+"Button["+i+"]");
var size = button.size;
size.left = buttonSpacer*rowIndex;
size.right = buttonSpacer*rowIndex + buttonSideLength;
size.top = buttonSpacer*rowNumber;
size.bottom = buttonSpacer*rowNumber + buttonSideLength;
button.size = size;
rowIndex++;
}
}
// Sets up "unit panels" - the panels with rows of icons (Helper function for updateUnitDisplay)
function setupUnitPanel(guiName, usedPanels, playerState, unitEntState, items, callback)
{
@ -12,7 +32,7 @@ function setupUnitPanel(guiName, usedPanels, playerState, unitEntState, items, c
for each (var item in items)
{
if (i > 15) // End loop early if more than 16 buttons
if (i > 23) // End loop early if there are more than 24 buttons
break;
// Get templates
@ -93,38 +113,26 @@ function setupUnitPanel(guiName, usedPanels, playerState, unitEntState, items, c
// Position the visible buttons (TODO: if there's lots, maybe they should be squeezed together to fit)
var buttonSideLength = getGUIObjectByName("unit"+guiName+"Button[0]").size.bottom;
var buttonSpacer = ((guiName == "Selection")? 37 : 45);
var numButtons = i;
var j = 0; // index for second row of buttons
for (i = 0; i < numButtons; ++i)
var buttonSpacer = ((guiName == "Selection")? 37 : 45);
if (numButtons < 9) // Row 0
{
var button = getGUIObjectByName("unit"+guiName+"Button["+i+"]");
var size = button.size;
if (i > 7) // Make second row
{
if (guiName == "Queue")
getGUIObjectByName("unit"+guiName+"Panel").size = "0 -104 100% 100%-166"
size.left = buttonSpacer*j;
size.right = buttonSpacer*j + buttonSideLength;
size.top = buttonSpacer;
size.bottom = buttonSpacer + buttonSideLength;
j++;
}
else // Make first row
{
if ((guiName == "Queue"))
getGUIObjectByName("unit"+guiName+"Panel").size = "0 -60 100% 100%-166"
size.left = buttonSpacer*i;
size.right = buttonSpacer*i + size.bottom;
}
button.size = size;
layoutButtonRow(0, guiName, buttonSideLength, buttonSpacer, 0, numButtons);
}
else if (numButtons < 17) // Row 1
{
layoutButtonRow(0, guiName, buttonSideLength, buttonSpacer, 0, 8);
layoutButtonRow(1, guiName, buttonSideLength, buttonSpacer, 8, numButtons);
}
else // Row 2
{
layoutButtonRow(0, guiName, buttonSideLength, buttonSpacer, 0, 8);
layoutButtonRow(1, guiName, buttonSideLength, buttonSpacer, 8, 16);
if (guiName != "Selection")
layoutButtonRow(2, guiName, buttonSideLength, buttonSpacer, 16, numButtons);
}
// Hide any buttons we're no longer using
for (i = numButtons; i < g_unitPanelButtons[guiName]; ++i)
getGUIObjectByName("unit"+guiName+"Button["+i+"]").hidden = true;
@ -132,7 +140,7 @@ function setupUnitPanel(guiName, usedPanels, playerState, unitEntState, items, c
g_unitPanelButtons[guiName] = numButtons;
}
// Updates right Unit Commands Panel - runs in the main session loop via updateSelectionDetails()
// Updates right Unit Commands Panel - runs in the main session loop via updateSelectionDetails()
function updateUnitCommands(playerState, entState, commandsPanel, selection)
{
// Panels that are active