From 9c2a09067f6bc08a5e67211133aaa0604218bb3a Mon Sep 17 00:00:00 2001 From: bb Date: Tue, 12 Oct 2021 20:25:09 +0000 Subject: [PATCH] Center generic/specific name if just one is given and hide the other Patch By: LangBart Comments By: Freagarach Differential Revision: D4290 fixes #6341 This was SVN commit r25964. --- .../mods/public/gui/session/selection_details.js | 13 +++++++++++-- .../selection_panels_middle/single_details_area.xml | 6 +++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/binaries/data/mods/public/gui/session/selection_details.js b/binaries/data/mods/public/gui/session/selection_details.js index 604aecbc79..08a278e5e9 100644 --- a/binaries/data/mods/public/gui/session/selection_details.js +++ b/binaries/data/mods/public/gui/session/selection_details.js @@ -301,11 +301,20 @@ function displaySingle(entState) Engine.GetGUIObjectByName("playerColorBackground").sprite = "color:" + g_DiplomacyColors.getPlayerColor(entState.player, 128); - Engine.GetGUIObjectByName("primary").caption = primaryName; - Engine.GetGUIObjectByName("secondary").caption = !secondaryName || primaryName == secondaryName ? "" : + const hideSecondary = !secondaryName || primaryName == secondaryName; + + const primaryObject = Engine.GetGUIObjectByName("primary"); + primaryObject.caption = primaryName; + const primaryObjectSize = primaryObject.size; + primaryObjectSize.rbottom = hideSecondary ? 100 : 50; + primaryObject.size = primaryObjectSize; + + const secondaryObject = Engine.GetGUIObjectByName("secondary"); + secondaryObject.caption = hideSecondary ? "" : sprintf(translate("(%(secondaryName)s)"), { "secondaryName": secondaryName }); + secondaryObject.hidden = hideSecondary; let isGaia = playerState.civ == "gaia"; Engine.GetGUIObjectByName("playerCivIcon").sprite = isGaia ? "" : "cropped:1.0, 0.15625 center:grayscale:" + civEmblem; diff --git a/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml b/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml index aadbbc0804..d1a1104cde 100644 --- a/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml +++ b/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml @@ -18,9 +18,9 @@ - - - + + +