From 31a2dd294e0a2d56abd281d80fc4685dec1d297c Mon Sep 17 00:00:00 2001 From: elexis Date: Sun, 22 Sep 2019 10:51:08 +0000 Subject: [PATCH] Fix top panel being hidden during pause mode following 702cdbf0c7 / D2292 reported by Freagarach, ValihrAnt, Krinkle et al. 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. --- binaries/data/mods/mod/gui/common/modern/styles.xml | 3 +-- binaries/data/mods/public/gui/credits/credits.xml | 2 +- binaries/data/mods/public/gui/locale/locale.js | 3 +++ binaries/data/mods/public/gui/session/session.xml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/binaries/data/mods/mod/gui/common/modern/styles.xml b/binaries/data/mods/mod/gui/common/modern/styles.xml index 10b096e4f8..17193f330f 100644 --- a/binaries/data/mods/mod/gui/common/modern/styles.xml +++ b/binaries/data/mods/mod/gui/common/modern/styles.xml @@ -6,6 +6,7 @@ - DEFAULT STYLE: The style with the name 'default' is special, it will - 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. -->