show placeholder for units without fluff

MegaMek · Aug 18, 2024 · 4d1af5c · 4d1af5c
1 parent 8c253ae
commit 4d1af5c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/megamek/data/images/fluff/fluff_placeholder.png b/megamek/data/images/fluff/fluff_placeholder.png
diff --git a/megamek/src/megamek/client/ui/swing/MechViewPanel.java b/megamek/src/megamek/client/ui/swing/MechViewPanel.java
@@ -21,6 +21,7 @@
 
 import megamek.client.ui.swing.util.FluffImageHelper;
 import megamek.client.ui.swing.util.UIUtil;
+import megamek.common.Configuration;
 import megamek.common.Entity;
 import megamek.common.MechView;
 import megamek.common.Report;
@@ -29,6 +30,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import javax.imageio.ImageIO;
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.HyperlinkEvent;
@@ -41,6 +43,9 @@
  */
 public class MechViewPanel extends JPanel {
 
+    private static final String PLACEHOLDER_IMAGE_NAME = Configuration.fluffImagesDir() + "/fluff_placeholder.png";
+    private static final Image PLACEHOLDER_IMAGE = readPlaceHolderImage();
+
     private final JTextPane txtMek = new JTextPane();
     private JScrollPane scrMek;
 
@@ -145,7 +150,11 @@ private void setFluffImage(Entity entity) {
         fluffImageIndex = 0;
         nextImageButton.setEnabled(fluffImageList.size() > 1);
         prevImageButton.setEnabled(fluffImageList.size() > 1);
-        showNextFluffImage();
+        if (entity != null) {
+            showNextFluffImage();
+        } else {
+            setFluffImage((Image) null);
+        }
     }
 
     private void setFluffImage(Image image) {
@@ -202,7 +211,7 @@ private void changeFluffImageIndex(int delta) {
                 imageInfoLabel.setText("Error loading fluff image");
             }
         } else {
-            setFluffImage((Image) null);
+            setFluffImage(PLACEHOLDER_IMAGE);
             imageInfoLabel.setText("");
         }
     }
@@ -218,4 +227,12 @@ private String prepareLabelText(File file) {
         }
         return labelText;
     }
+
+    private static Image readPlaceHolderImage() {
+        try {
+            return ImageIO.read(new File(PLACEHOLDER_IMAGE_NAME));
+        } catch (IOException e) {
+            return null;
+        }
+    }
 }