Ticket #4052: t4051_disabled_sprite_v1.patch

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

@@ -421 +421 @@
 
         data.button.onPress = function() {
             unloadTemplate(data.item.template);
         };
 
-        data.button.tooltip = sprintf(
-            translate("Unload %(name)s"),
-            { "name": getEntityNames(template) }) + "\n" +
-            translate("Single-click to unload 1. Shift-click to unload all of this type.");
-
         data.countDisplay.caption = data.item.ents.length || "";
 
         let garrisonedUnitOwner = GetEntityState(data.item.ents[0]).player;
+        
+        let canUngarrison =
+            g_ViewedPlayer == data.unitEntState.player ||
+            g_ViewedPlayer == garrisonedUnitOwner;
+
+        data.button.enabled = canUngarrison && controlsPlayer(g_ViewedPlayer);
+
+        data.button.tooltip = canUngarrison || g_IsObserver ?
+            sprintf(translate("Unload %(name)s"),
+            { "name": getEntityNames(template) }) + "\n" +
+            translate("Single-click to unload 1. Shift-click to unload all of this type.") :
+            getEntityNames(template);
 
         data.button.sprite = "color:" + rgbToGuiColor(g_Players[garrisonedUnitOwner].color) + ":";
-        data.button.enabled =
-            controlsPlayer(data.unitEntState.player) ||
-            controlsPlayer(garrisonedUnitOwner);
+        data.button.sprite_disabled = data.button.sprite;
 
-        data.icon.sprite = "stretched:session/portraits/" + template.icon;
+        // Selection panel buttons only appear disabled if they
+        // also appear disabled to the owner of the building.
+        data.icon.sprite =
+            (canUngarrison || g_IsObserver ? "" : "grayscale:") +
+            "stretched:session/portraits/" + template.icon;
 
         setPanelObjectPosition(data.button, data.i, data.rowLength);
+
         return true;
     }
 };
 
 g_SelectionPanels.Gate = {