Ticket #4112: hidereadybutton7.patch

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -522 +522 @@
         g_GameAttributes.settings.LastManStanding = false;
         updateGameAttributes();
     };
 }
 
+function hideStartGameButton(hidden)
+{
+    const offset = 10;
+    let cheatWarningOffset = Engine.GetGUIObjectByName("cancelGame").size.left - Engine.GetGUIObjectByName("cheatWarningText").size.right;
+    let onscreenToolTipOffset = Engine.GetGUIObjectByName("cancelGame").size.left - Engine.GetGUIObjectByName("onscreenToolTip").size.right;
+
+    Engine.GetGUIObjectByName("startGame").hidden = hidden;
+
+    let right = hidden ? Engine.GetGUIObjectByName("startGame").size.right : Engine.GetGUIObjectByName("startGame").size.left - offset;
+
+    // Move the cheatWarningText and back button to the right when hidden.
+    let cancelGameSize = Engine.GetGUIObjectByName("cancelGame").size;
+    let xButtonSize = cancelGameSize.right - cancelGameSize.left;
+    cancelGameSize.right = right;
+    right -= xButtonSize;
+    cancelGameSize.left = right;
+    Engine.GetGUIObjectByName("cancelGame").size = cancelGameSize;
+
+    let cheatWarningTextSize = Engine.GetGUIObjectByName("cheatWarningText").size;
+    cheatWarningTextSize.right = right - cheatWarningOffset;
+    Engine.GetGUIObjectByName("cheatWarningText").size = cheatWarningTextSize;
+
+    // Increase the size of onscreenToolTip when hidden.
+    let onscreenToolTipSize = Engine.GetGUIObjectByName("onscreenToolTip").size;
+    onscreenToolTipSize.right = right - onscreenToolTipOffset;
+    Engine.GetGUIObjectByName("onscreenToolTip").size = onscreenToolTipSize;
+}
+
 /**
  * If we're a network client, hide the controls and show the text instead.
  */
 function hideControls()
 {
@@ -538 +566 @@
         Engine.GetGUIObjectByName("playerAssignment["+i+"]").hidden = true;
         Engine.GetGUIObjectByName("playerCiv["+i+"]").hidden = true;
         Engine.GetGUIObjectByName("playerTeam["+i+"]").hidden = true;
     }
 
+    // The start game button should be hidden until the player assignments are received
+    // and it is known whether the local player is an observer.
+    hideStartGameButton(true);
     Engine.GetGUIObjectByName("startGame").enabled = true;
 }
 
 /**
  * Hides the GUI controls for clients and shows the read-only label instead.
@@ -728 +759 @@
         if (!message.newAssignments[guid])
             onClientLeave(guid);
 
     g_PlayerAssignments = message.newAssignments;
 
+    hideStartGameButton(!g_IsController && g_PlayerAssignments[Engine.GetPlayerGUID()].player == -1);
+
     updatePlayerList();
     updateReadyUI();
     sendRegisterGameStanza();
 }