mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-25 02:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix top panel being hidden during pause mode following 702cdbf0c7 / D2292 reported by Freagarach, ValihrAnt, Krinkle et al.

Browse Source 
Remove the false misleading default.cfg z value that is always
overwritten by CGUI::Xeromyces_ReadObject, both introduced in
e21ebb37f5.
Remove multiline property since its redundant with the default C++
boolean, making the default style more agnostic of final GUI Object
classes.

Close advanced locale dialog correctly upon cancel following 86c151ebaa
/ D1684.
Don't switch the background image when closing the credits dialog
following bcf2c75513, refs #3744.

This was SVN commit r22966.
This commit is contained in:
elexis
2019-09-22 10:51:08 +00:00
parent 2678d5e52e
commit 31a2dd294e
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/mod/gui/common/modern/styles.xml
+1 -2
View File
@@ -6,6 +6,7 @@
- DEFAULT STYLE: The style with the name 'default' is special, it will - DEFAULT STYLE: The style with the name 'default' is special, it will
- be called by every object before any other style is loaded. - be called by every object before any other style is loaded.
========================================== ==========================================
Note that the default z value is determined by GUI engine regardless of what is specified here.
--> -->
<style name="default" <style name="default"
absolute="false" absolute="false"
@@ -13,10 +14,8 @@
ghost="false" ghost="false"
hidden="false" hidden="false"
size="0 0 100% 100%" size="0 0 100% 100%"
z="0"
font="sans-14" font="sans-14"
buffer_zone="5" buffer_zone="5"
multiline="false"
/> />
<style name="ModernWindow" <style name="ModernWindow"
sprite="ModernWindow" sprite="ModernWindow"
binaries/data/mods/public/gui/credits/credits.xml
+1 -1
View File
@@ -31,7 +31,7 @@
<object type="button" style="ModernButtonRed" size="100%-200 100%-45 100%-17 100%-17" hotkey="cancel"> <object type="button" style="ModernButtonRed" size="100%-200 100%-45 100%-17 100%-17" hotkey="cancel">
<translatableAttribute id="caption">Close</translatableAttribute> <translatableAttribute id="caption">Close</translatableAttribute>
<action on="Press"> <action on="Press">
Engine.SwitchGuiPage("page_pregame.xml"); Engine.PopGuiPage();
</action> </action>
</object> </object>
</object> </object>
binaries/data/mods/public/gui/locale/locale.js
+3
View File
@@ -60,6 +60,9 @@ function openAdvancedMenu()
function applyFromAdvancedMenu(locale) function applyFromAdvancedMenu(locale)
{ {
if (!locale)
return;
var languageList = Engine.GetGUIObjectByName("languageList"); var languageList = Engine.GetGUIObjectByName("languageList");
var currentLocaleDictName = Engine.GetFallbackToAvailableDictLocale(locale); var currentLocaleDictName = Engine.GetFallbackToAvailableDictLocale(locale);
binaries/data/mods/public/gui/session/session.xml
+1 -1
View File
@@ -63,7 +63,7 @@
</object> </object>
<!-- Pause Overlay --> <!-- Pause Overlay -->
<object type="button" name="pauseOverlay" tooltip_style="sessionToolTip" hidden="true"> <object type="button" name="pauseOverlay" tooltip_style="sessionToolTip" hidden="true" z="0">
<object type="image" sprite="sessionOverlayBackground" ghost="true"/> <object type="image" sprite="sessionOverlayBackground" ghost="true"/>
<object size="50%-128 40%-20 50%+128 40%+20" type="text" style="PauseText" ghost="true"> <object size="50%-128 40%-20 50%+128 40%+20" type="text" style="PauseText" ghost="true">
<translatableAttribute id="caption">Game Paused</translatableAttribute> <translatableAttribute id="caption">Game Paused</translatableAttribute>