Fix stale label, minimap, and FOV on 'next unit'

MegaMek · Sep 15, 2024 · f8cac64 · f8cac64
1 parent 9108018
commit f8cac64
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/MovementDisplay.java b/megamek/src/megamek/client/ui/swing/MovementDisplay.java
@@ -653,17 +653,17 @@ public synchronized void selectEntity(int en) {
 
         currentEntity = en;
         clientgui.setSelectedEntityNum(en);
-        gear = MovementDisplay.GEAR_LAND;
+        updateUnitDisplay(ce);
 
+        gear = MovementDisplay.GEAR_LAND;
         clientgui.getBoardView().setHighlightColor(GUIP.getMoveDefaultColor());
-        clear();
 
+        clear();
         updateButtonsLater();
 
         clientgui.getBoardView().highlight(ce.getPosition());
         clientgui.getBoardView().select(null);
         clientgui.getBoardView().cursor(null);
-        updateUnitDisplayLater(ce);
         if (!clientgui.getBoardView().isMovingUnits()) {
             clientgui.getBoardView().centerOnHex(ce.getPosition());
         }
@@ -682,6 +682,7 @@ public synchronized void selectEntity(int en) {
         } else {
             setStatusBarText(yourTurnMsg);
         }
+
         clientgui.clearFieldOfFire();
         computeMovementEnvelope(ce);
         updateMove();
@@ -697,21 +698,15 @@ private boolean isEnabled(MoveCommand c) {
     }
 
     /**
-     * Signals Unit Display to update later on the AWT event stack.
-     * See Issue:#4876 and #4444. This is done to prevent blank general tab when
-     * switching
-     * units when the map is zoomed all the way out.
+     * Updates the Unit Display Panels by selecting the current entity in the unit display
+     * and shows the MekPanelTabTrip if configured.
+     * @param ce
      */
-    private void updateUnitDisplayLater(Entity ce) {
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                clientgui.getUnitDisplay().displayEntity(ce);
-                if (GUIP.getMoveDisplayTabDuringMovePhases()) {
-                    clientgui.getUnitDisplay().showPanel(MekPanelTabStrip.SUMMARY);
-                }
-            }
-        });
+    private void updateUnitDisplay(final Entity ce) {
+        clientgui.getUnitDisplay().displayEntity(ce);
+        if (GUIP.getMoveDisplayTabDuringMovePhases()) {
+            clientgui.getUnitDisplay().showPanel(MekPanelTabStrip.SUMMARY);
+        }
     }
 
     /**
@@ -724,13 +719,10 @@ public void run() {
      */
     private void updateButtonsLater() {
         SwingUtilities.invokeLater(new Runnable() {
-
             @Override
             public void run() {
                 updateButtons();
             }
-
-            ;
         });
     }
 

diff --git a/megamek/src/megamek/client/ui/swing/boardview/BoardView.java b/megamek/src/megamek/client/ui/swing/boardview/BoardView.java
@@ -2918,7 +2918,7 @@ public void redrawEntity(Entity entity) {
         }
 
         updateEcmList();
-        highlightSelectedEntity();
+        highlightSelectedEntity(getSelectedEntity());
         scheduleRedraw();
     }
 
@@ -3027,7 +3027,7 @@ void redrawAllEntities() {
         // Update ECM list, to ensure that Sprites are updated with ECM info
         updateEcmList();
         // Re-highlight a selected entity, if present
-        highlightSelectedEntity();
+        highlightSelectedEntity(getSelectedEntity());
 
         scheduleRedraw();
     }
@@ -4094,9 +4094,9 @@ public void highlight(int x, int y) {
         highlight(new Coords(x, y));
     }
 
-    public synchronized void highlightSelectedEntity() {
+    public synchronized void highlightSelectedEntity(Entity e) {
         for (EntitySprite sprite : entitySprites) {
-            sprite.setSelected(sprite.entity.equals(getSelectedEntity()));
+            sprite.setSelected(sprite.entity.equals(e));
         }
     }
 
@@ -4429,7 +4429,7 @@ public void run() {
     public synchronized void selectEntity(Entity e) {
         checkFoVHexImageCacheClear();
         updateEcmList();
-        highlightSelectedEntity();
+        highlightSelectedEntity(e);
     }
 
     /**