Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Fixed command button alignment (functionality still pending). Minor improvement to tip text in loading screen.

Browse Source 
This was SVN commit r2120.
This commit is contained in:
Acumen 2005-04-09 16:07:46 +00:00
parent d983be8fdc
commit a91f2d2079
3 changed files with 73 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/mods/official/gui/test/3_loading.xml
View File

@ -53,7 +53,7 @@
<!-- text -->
<object type="text" name="loading_screen_text" size="23.571428% 40 100%-32 100%-100" absolute="false" font="prospero18" z="165" hidden="false"/>
<object type="button" name="loading_screen_tip" sprite="only_white_border" size="32 100%-150 100%-32 100%-32" font="tahoma18" text_valign="center" textcolor="0 0 0" z="165" hidden="false"/>
<object type="text" name="loading_screen_tip" sprite="0ad_indent_lite" size="32 100%-150 100%-32 100%-32" font="trebuchet16" text_align="left" text_valign="center" textcolor="0 0 0" z="165" hidden="false"/>
</object>
</objects>

75
binaries/data/mods/official/gui/test/functions_session_status_orb.js
View File

@ -214,7 +214,8 @@ function initStatusOrb()
SN_STATUS_PANE_COMMAND.tab.max = 13; // Maximum number of buttons (either single or lists).
SN_STATUS_PANE_COMMAND.list.max = 11; // Maximum number of entries in a list.
SN_STATUS_PANE_COMMAND.button.max = 5; // Number of tabs that are single buttons (no list).
SN_STATUS_PANE_COMMAND.span = 2;
SN_STATUS_PANE_COMMAND.split = 9; // When we reach this button, split the rows (remainder are vertical, not horizontal).
SN_STATUS_PANE_COMMAND.span = 2; // Spacing between lists.
for (loop = 0; loop < SN_STATUS_PANE_COMMAND.list.max+1; loop++)
SN_STATUS_PANE_COMMAND[loop] = new Array();
@ -236,19 +237,39 @@ function initStatusOrb()
SN_STATUS_PANE_COMMAND[SN_STATUS_PANE_COMMAND.list.curr][SN_STATUS_PANE_COMMAND.tab.curr].name = new Object();
SN_STATUS_PANE_COMMAND[SN_STATUS_PANE_COMMAND.list.curr][SN_STATUS_PANE_COMMAND.tab.curr].last = new Object();
if (SN_STATUS_PANE_COMMAND.list.curr == 1)
if (SN_STATUS_PANE_COMMAND.tab.curr >= SN_STATUS_PANE_COMMAND.split)
{
if (SN_STATUS_PANE_COMMAND.tab.curr == 1 && SN_STATUS_PANE_COMMAND.list.curr == 1)
Crd[Crd.last-1].x = Crd[SN_STATUS_PANE_BG].x;
else
Crd[Crd.last-1].x = Crd[Crd.last-3].x+Crd[Crd.last-3].width;
if (SN_STATUS_PANE_COMMAND.list.curr == 1)
{
Crd[Crd.last-1].x = Crd[SN_STATUS_PANE_BG].x+Crd[SN_STATUS_PANE_BG].width;
Crd[Crd.last-1].y = Crd[SN_STATUS_PANE_BG].y+Crd[SN_STATUS_PANE_BG].height;
if (SN_STATUS_PANE_COMMAND.tab.curr == SN_STATUS_PANE_COMMAND.split && SN_STATUS_PANE_COMMAND.list.curr == 1)
Crd[Crd.last-1].y = Crd[SN_STATUS_PANE_BG].y;
else
Crd[Crd.last-1].y = Crd[Crd.last-3].y+Crd[Crd.last-3].height;
}
else
{
Crd[Crd.last-1].x = Crd[Crd.last-3].x+Crd[Crd.last-3].width+SN_STATUS_PANE_COMMAND.span;
Crd[Crd.last-1].y = Crd[Crd.last-3].y;
}
}
else
{
Crd[Crd.last-1].x = Crd[Crd.last-3].x;
Crd[Crd.last-1].y = Crd[Crd.last-3].y+Crd[Crd.last-3].height+SN_STATUS_PANE_COMMAND.span;
if (SN_STATUS_PANE_COMMAND.list.curr == 1)
{
if (SN_STATUS_PANE_COMMAND.tab.curr == 1 && SN_STATUS_PANE_COMMAND.list.curr == 1)
Crd[Crd.last-1].x = Crd[SN_STATUS_PANE_BG].x;
else
Crd[Crd.last-1].x = Crd[Crd.last-3].x+Crd[Crd.last-3].width;
Crd[Crd.last-1].y = Crd[SN_STATUS_PANE_BG].y+Crd[SN_STATUS_PANE_BG].height;
}
else
{
Crd[Crd.last-1].x = Crd[Crd.last-3].x;
Crd[Crd.last-1].y = Crd[Crd.last-3].y+Crd[Crd.last-3].height+SN_STATUS_PANE_COMMAND.span;
}
}
SN_STATUS_PANE_COMMAND_FLP[SN_STATUS_PANE_COMMAND.list.curr][SN_STATUS_PANE_COMMAND.tab.curr] = addArrayElement(Crd, Crd.last);
@ -257,19 +278,39 @@ function initStatusOrb()
Crd[Crd.last-1].width = Crd[Crd.last-2].width;
Crd[Crd.last-1].height = Crd[Crd.last-2].height;
if (SN_STATUS_PANE_COMMAND.list.curr == 1)
if (SN_STATUS_PANE_COMMAND.tab.curr >= SN_STATUS_PANE_COMMAND.split)
{
if (SN_STATUS_PANE_COMMAND.tab.curr == 1 && SN_STATUS_PANE_COMMAND.list.curr == 1)
Crd[Crd.last-1].x = Crd[SN_STATUS_PANE_BG].x;
else
Crd[Crd.last-1].x = Crd[Crd.last-3].x+Crd[Crd.last-3].width;
if (SN_STATUS_PANE_COMMAND.list.curr == 1)
{
Crd[Crd.last-1].x = Crd[SN_STATUS_PANE_BG].x+Crd[SN_STATUS_PANE_BG].width;
Crd[Crd.last-1].y = Crd[SN_STATUS_PANE_BG].y+Crd[SN_STATUS_PANE_BG].height;
if (SN_STATUS_PANE_COMMAND.tab.curr == SN_STATUS_PANE_COMMAND.split && SN_STATUS_PANE_COMMAND.list.curr == 1)
Crd[Crd.last-1].y = Crd[SN_STATUS_PANE_BG].y;
else
Crd[Crd.last-1].y = Crd[Crd.last-3].y+Crd[Crd.last-3].height;
}
else
{
Crd[Crd.last-1].x = Crd[Crd.last-3].x+Crd[Crd.last-3].width+SN_STATUS_PANE_COMMAND.span;
Crd[Crd.last-1].y = Crd[Crd.last-3].y;
}
}
else
{
Crd[Crd.last-1].x = Crd[Crd.last-3].x;
Crd[Crd.last-1].y = Crd[Crd.last-3].y+Crd[Crd.last-3].height+SN_STATUS_PANE_COMMAND.span;
if (SN_STATUS_PANE_COMMAND.list.curr == 1)
{
if (SN_STATUS_PANE_COMMAND.tab.curr == 1 && SN_STATUS_PANE_COMMAND.list.curr == 1)
Crd[Crd.last-1].x = Crd[SN_STATUS_PANE_BG].x;
else
Crd[Crd.last-1].x = Crd[Crd.last-3].x+Crd[Crd.last-3].width;
Crd[Crd.last-1].y = Crd[SN_STATUS_PANE_BG].y+Crd[SN_STATUS_PANE_BG].height;
}
else
{
Crd[Crd.last-1].x = Crd[Crd.last-3].x;
Crd[Crd.last-1].y = Crd[Crd.last-3].y+Crd[Crd.last-3].height+SN_STATUS_PANE_COMMAND.span;
}
}
}
}

14
binaries/data/mods/official/gui/test/sprite1.xml
View File

@ -203,6 +203,20 @@
<image backcolor="0 0 0 85" size="1 1 100%-1 100%-1"/>
</sprite>
<sprite name="0ad_indent_lite">
<!-- Starting with top left corner continuing in a clockwise manner -->
<!-- Top border -->
<image backcolor="109 122 146" size="0 0 100%-1 1" />
<!-- Right border -->
<image backcolor="220 223 228" size="100%-1 0 100% 100%" />
<!-- Bottom border -->
<image backcolor="220 223 228" size="0 100%-1 100% 100%" />
<!-- Left border -->
<image backcolor="109 122 146" size="0 0 1 100%-1" />
<!-- middle -->
<image backcolor="100 100 100 85" size="1 1 100%-1 100%-1"/>
</sprite>
<sprite name="translucent_background">
<image backcolor="0 0 0 85" size="0 0 100% 100%"/>
</sprite>