Ticket #1552: gate-convert-lock.patch

binaries/data/mods/public/gui/session/unit_commands.js

@@ -421 +421 @@
         button.tooltip = tooltip;
 
         // Button Function (need nested functions to get the closure right)
-        button.onpress = (function(e){ return function() { callback(e) } })(item);
+        if (item.func)
+            button.onpress = (function(e){ return function() { e.func(e) } })(item);
+        else
+            button.onpress = (function(e){ return function() { callback(e) } })(item);
 
         if (guiName == RESEARCH)
         {
@@ -511 +514 @@
         {
             var gateIcon;
             // If already a gate, show locking actions
-            if (unitEntState.gate)
+            if (item.gate)
             {
-                gateIcon = "icons/lock_" + GATE_ACTIONS[i].toLowerCase() + "ed.png";
-                selection.hidden = unitEntState.gate.locked != item.locked;
+                gateIcon = "icons/lock_" + GATE_ACTIONS[ Number(!item.locked) ].toLowerCase() + "ed.png";
+                selection.hidden = item.gate.locked === undefined ? false : item.gate.locked != item.locked;
             }
             // otherwise show gate upgrade icon
             else
@@ -818 +821 @@
                 function (trainEntType) { addTrainingToQueue(selection, trainEntType); } );
         else if (entState.trader)
             setupUnitTradingPanel(usedPanels, entState, selection);
-        else if (entState.gate)
+        else if (!entState.foundation && entState.gate || hasClass(entState, "LongWall"))
         {
-            var items = [];
-            for (var i = 0; i < GATE_ACTIONS.length; ++i)
-                items.push({
-                    "tooltip": GATE_ACTIONS[i] + " gate",
-                    "locked": i == 0
-                });
-            setupUnitPanel(GATE, usedPanels, entState, items,
-                function (item) { lockGate(item.locked); } );
-        }
-        else if (!entState.foundation && (hasClass(entState, "LongWall")))
-        {
             // Allow long wall pieces to be converted to gates
             var longWallTypes = {};
-            var items = [];
+            var walls = [];
+            var gates = [];
             for (var i in selection)
             {
-                if ((state = GetEntityState(selection[i])) && hasClass(state, "LongWall") &&
-                    !state.gate && !state.foundation && !longWallTypes[state.template])
+                state = GetEntityState(selection[i]);
+                if (hasClass(state, "LongWall") && !state.gate && !longWallTypes[state.template])
                 {
                     var gateTemplate = getWallGateTemplate(state.id);
                     if (gateTemplate)
@@ -845 +838 @@
                         var wallName = GetTemplateData(state.template).name.generic;
                         var gateName = GetTemplateData(gateTemplate).name.generic;
 
-                        items.push({
+                        walls.push({
                             "tooltip": "Convert " + wallName + " to " + gateName,
-                            "template": gateTemplate
+                            "template": gateTemplate,
+                            "func": function (item) { transformWallToGate(item.template); }
                         });
                     }
 
                     // We only need one entity per type.
                     longWallTypes[state.template] = true;
                 }
+                else if (state.gate && !gates.length)
+                    for (var j = 0; j < GATE_ACTIONS.length; ++j)
+                        gates.push({
+                            "gate": state.gate,
+                            "tooltip": GATE_ACTIONS[j] + " gate",
+                            "locked": j == 0,
+                            "func": function (item) { lockGate(item.locked); }
+                        });
+                // Show both 'locked' and 'unlocked' as active if the selected gates have both lock states.
+                else if (state.gate && state.gate.locked != gates[0].gate.locked)
+                    for (var j = 0; j < gates.length; ++j)
+                        delete gates[j].gate.locked;
             }
 
+            // Place gate control icons first if the main selection is a gate.
+            var items = entState.gate ? gates.concat(walls) : walls.concat(gates);
             if (items.length)
-                setupUnitPanel(GATE, usedPanels, entState, items,
-                    function (item) { transformWallToGate(item.template); } );
+                setupUnitPanel(GATE, usedPanels, entState, items);
             else
                 rightUsed = false;
         }