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

Update existing minimap idle button, add minimap idle button highlight and disabled, and some style fixes in session.xml. Refs #823 and refs #2357

Browse Source 
This was SVN commit r14658.
This commit is contained in:
JoshuaJB 2014-01-24 18:40:01 +00:00
parent 2f145b1578
commit 5d4f509810
5 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
binaries/data/mods/public/art/textures/ui/session/minimap-idle-disabled.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/ui/session/minimap-idle-highlight.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/ui/session/minimap-idle.png (Stored with Git LFS)
View File

Binary file not shown.

12
binaries/data/mods/public/gui/session/session.js
View File

@ -965,3 +965,15 @@ function reportGame(extendedSimState)
"tradeIncome": playerTradeIncomeString
});
}
/* Since minimap buttons are a composite of smaller ones, we can't
* directly use sprite_down etc on them. Each smaller button calls this
* function which activates the larger overlay sprite.
*/
function minimapButtonAction(name, action)
{
var overlay = Engine.GetGUIObjectByName(name + "-overlay");
var inactiveSpriteName = "overlay.sprite_" + action;
overlay.sprite = eval(inactiveSpriteName);
}

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

@ -459,7 +459,7 @@
<!-- Trading goods -->
<object name="tradeGoods" size="20 50 100%-20 82">
<object name="tradeHeader" size="0 0 180 100%" type="text" style="ModernLeftLabelText" ghost="true" caption="Trading goods selection:"/>
<object name="tradeHeader" size="0 0 180 100%" type="text" style="ModernLabelText" text_align="left" ghost="true" caption="Trading goods selection:"/>
<object size="180 0 100% 100%">
<repeat count="4">
@ -467,7 +467,7 @@
<object name="tradeResourceButton[n]" size="4 0 36 100%" type="button" style="StoneButton">
<object name="tradeResourceIcon[n]" type="image" ghost="true"/>
<object name="tradeResourceSelection[n]" type="image" sprite="stretched:session/icons/corners.png" ghost="true"/>
<object name="tradeResourceText[n]" type="text" style="ModernCenteredLabelText" ghost="true"/>
<object name="tradeResourceText[n]" type="text" style="ModernLabelText" ghost="true"/>
</object>
<object name="tradeArrowUp[n]" size="36 0 52 50%" type="button" style="iconButton">
<object type="image" ghost="true" sprite="wheatArrowUp"/>
@ -484,10 +484,10 @@
</object>
<object name="tradeStatistics" size="20 120 100%-20 168">
<object size="0 0 130 50%" type="text" style="ModernLeftLabelText" ghost="true" caption="Traders:"/>
<object name="landTraders" size="130 0 100% 50%" type="text" style="ModernLeftLabelText" ghost="true" />
<object size="0 50% 130 100%" type="text" style="ModernLeftLabelText" ghost="true" caption = "Merchant ships:"/>
<object name="shipTraders" size="130 50% 100% 100%" type="text" style="ModernLeftLabelText" ghost="true" />
<object size="0 0 130 50%" type="text" style="ModernLabelText" text_align="left" ghost="true" caption="Traders:"/>
<object name="landTraders" size="130 0 100% 50%" type="text" style="ModernLabelText" text_align="left" ghost="true" />
<object size="0 50% 130 100%" type="text" style="ModernLabelText" text_align="left" ghost="true" caption = "Merchant ships:"/>
<object name="shipTraders" size="130 50% 100% 100%" type="text" style="ModernLabelText" text_align="left" ghost="true" />
</object>
<object size="50%-64 100%-50 50%+64 100%-22" type="button" style="StoneButton">
@ -948,10 +948,10 @@
<object name="minimapOverlay" size="4 4 100%-4 100%-4" type="image" sprite="stretched:session/minimap_circle_modern.png" ghost="true"/>
<!-- Idle Worker Button -->
<object size="100%-36 100%-36 100%-4 100%-4">
<object size="100%-36 100%-36 100%-5 100%-5">
<!-- TODO: should highlight the button if there's non-zero idle workers -->
<object size="-80 -80 100% 100%" type="image" sprite="stretched:session/minimap-idle.png" ghost="true" />
<!-- Since we don't support non-rectangular buttons, we approximate the area using 3 rectangles -->
<object name="idle-overlay" size="-85 -85 100% 100%" type="image" sprite="stretched:session/minimap-idle.png" ghost="true"/>
<!-- Since we don't support non-rectangular buttons, we approximate the area using 3 rectangles TODO: Make this cleaner -->
<object type="button"
tooltip_style="sessionToolTip"
tooltip="Find idle worker"
@ -971,7 +971,7 @@
tooltip="Find idle worker"
size="-15 15 0 100%"
>
<action on="Press">findIdleUnit(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
<action on="Press">minimapButtonAction("idle", "pressed");findIdleUnit(["Female", "Trade", "FishingBoat", "CitizenSoldier", "Healer"]);</action>
</object>
</object>
</object>