gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Display chat correctly and allow opening the diplomacy manager, trade page and menu while waiting for other clients to finish the loading screen and after becoming disconnecting.

Browse Source 
Remove unused useless related styles.

Differential Revision: https://code.wildfiregames.com/D556
Reviewed By: fatherbushido
This was SVN commit r19663.
This commit is contained in:
elexis
2017-05-26 15:20:11 +00:00
parent db0cf8d467
commit 53c596ea41
2 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/common/styles.xml
-21
View File
@@ -28,27 +28,6 @@
==========================================
-->
<style name="CenteredButtonText"
font="sans-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="center"
/>
<style name="LeftButtonText"
font="sans-bold-stroke-14"
textcolor="white"
text_align="left"
text_valign="top"
/>
<style name="RightButtonText"
font="sans-bold-stroke-14"
textcolor="white"
text_align="right"
text_valign="top"
/>
<style name="LeftLabelText"
font="sans-bold-stroke-14"
textcolor="gold"
binaries/data/mods/public/gui/session/session.xml
+15 -16
View File
@@ -55,6 +55,21 @@
</action>
</object>
<!-- Network status -->
<object name="netStatus" type="text" style="netStatus" z="0" hidden="true">
<object type="button"
name="disconnectedExitButton"
style="StoneButton"
size="50%-84 50%+128 50%+84 50%+160"
tooltip_style="sessionToolTip"
z="0"
>
<translatableAttribute id="caption">Exit</translatableAttribute>
<action on="Press">leaveGame();</action>
</object>
<object name="loadingClientsText" size="50%-300 50%+60 50%+300 50%+110" type="text" style="netStatusPlayersText" hidden="true" z="0"/>
</object>
<!-- Pause Overlay -->
<object type="button" name="pauseOverlay" size="0 0 100% 100%" tooltip_style="sessionToolTip" hidden="true" z="0">
<object size="0 0 100% 100%" type="image" sprite="devCommandsBackground" ghost="true" z="0"/>
@@ -151,20 +166,4 @@
<!-- Selection bandbox -->
<object name="bandbox" type="image" sprite="bandbox" ghost="true" hidden="true" z="200"/>
<!-- Network status -->
<object name="netStatus" type="text" style="netStatus" z="200" hidden="true">
<object type="button"
name="disconnectedExitButton"
style="StoneButton"
size="50%-84 50%+128 50%+84 50%+160"
tooltip_style="sessionToolTip"
>
<object size="0 0 100% 100%" type="text" style="CenteredButtonText" name="disconnectedExitButtonText" ghost="true">
<translatableAttribute id="caption">Exit</translatableAttribute>
</object>
<action on="Press">leaveGame();</action>
</object>
<object name="loadingClientsText" size="50%-300 50%+60 50%+300 50%+110" type="text" style="netStatusPlayersText" hidden="true" z="0"/>
</object>
</objects>