Merge pull request #5649 from Baaaaaz/feature/5632-apply-flat-labels-to-initiative-panel

Apply flat labels to initiative panel

Author: kwvanderlinde

src/main/java/net/rptools/maptool/client/swing/label/FlatImageLabel.java

@@ -164,26 +164,51 @@ public Dimension getDimensions(Graphics2D graphics2D, String string) {
 
   /**
    * Renders a string with customizable properties such as font, padding, colors, and justification
-   * using the specified graphics context.
+   * using the specified graphics context. Height and width are computed based on the provided
+   * string. Also see {@link #render(Graphics2D, int, int, int, int, String)}.
    *
    * @param graphics2D the graphics context used for rendering
    * @param x the x-coordinate of the top-left corner of the rendered string
    * @param y the y-coordinate of the top-left corner of the rendered string
    * @param string the string to be rendered
    * @return a Rectangle representing the dimensions and position of the rendered string with
-   *     padding
+   *     padding.
    */
   public Rectangle render(Graphics2D graphics2D, int x, int y, String string) {
+
     var g2d = (Graphics2D) graphics2D.create();
     g2d.setFont(font);
-    var fm = g2d.getFontMetrics();
-    int strWidth = SwingUtilities.computeStringWidth(fm, string);
-    int strHeight = fm.getAscent() - fm.getDescent() - fm.getLeading();
 
     var dim = getDimensions(g2d, string);
     int width = (int) dim.getWidth();
     int height = (int) dim.getHeight();
 
+    g2d.dispose();
+
+    return render(graphics2D, x, y, width, height, string);
+  }
+
+  /**
+   * Renders a string with customizable properties such as font, padding, colors, and justification
+   * using the specified graphics context.
+   *
+   * @param graphics2D the graphics context used for rendering
+   * @param x the x-coordinate of the top-left corner of the rendered string
+   * @param y the y-coordinate of the top-left corner of the rendered string
+   * @param width the width of the label
+   * @param height the height of the label
+   * @param string the string to be rendered
+   * @return a Rectangle representing the dimensions and position of the rendered string with
+   *     padding
+   */
+  public Rectangle render(
+      Graphics2D graphics2D, int x, int y, int width, int height, String string) {
+    var g2d = (Graphics2D) graphics2D.create();
+    g2d.setFont(font);
+    var fm = g2d.getFontMetrics();
+    int strWidth = SwingUtilities.computeStringWidth(fm, string);
+    int strHeight = fm.getAscent() - fm.getDescent() - fm.getLeading();
+
     var bounds = new Rectangle(x, y, width, height);
 
     int stringY = y + height / 2 + strHeight / 2;
@@ -206,6 +231,7 @@ public Rectangle render(Graphics2D graphics2D, int x, int y, String string) {
       g2d.draw(labelRect);
     }
 
+    g2d.dispose();
     return bounds;
   }
 }

src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativeListCellRenderer.java

@@ -30,16 +30,16 @@
 import net.rptools.lib.image.ImageUtil;
 import net.rptools.maptool.client.AppPreferences;
 import net.rptools.maptool.client.MapTool;
-import net.rptools.maptool.client.swing.ImageLabel;
 import net.rptools.maptool.client.swing.SwingUtil;
+import net.rptools.maptool.client.swing.label.FlatImageLabel;
+import net.rptools.maptool.client.swing.label.FlatImageLabelFactory;
 import net.rptools.maptool.client.ui.theme.Borders;
 import net.rptools.maptool.client.ui.theme.Icons;
 import net.rptools.maptool.client.ui.theme.RessourceManager;
 import net.rptools.maptool.client.ui.token.AbstractTokenOverlay;
 import net.rptools.maptool.client.ui.token.BarTokenOverlay;
 import net.rptools.maptool.model.InitiativeList.TokenInitiative;
 import net.rptools.maptool.model.Token;
-import net.rptools.maptool.util.GraphicsUtil;
 import net.rptools.maptool.util.ImageManager;
 
 /**
@@ -64,7 +64,7 @@ public class InitiativeListCellRenderer extends JPanel
   private final InitiativePanel panel;
 
   /** Used to draw the background of the item. */
-  private ImageLabel backgroundImageLabel;
+  private FlatImageLabel backgroundFlatImageLabel;
 
   /**
    * The text height for the background image label. Only the text is painted inside, the token
@@ -158,11 +158,18 @@ public Component getListCellRendererComponent(
       setBorder(UNSELECTED_BORDER);
       return this;
     } // endif
-    backgroundImageLabel =
-        token.isVisible()
-            ? token.getType() == Token.Type.NPC ? GraphicsUtil.BLUE_LABEL : GraphicsUtil.GREY_LABEL
-            : GraphicsUtil.DARK_GREY_LABEL;
-    name.setForeground(Color.BLACK);
+
+    var labelRenderFactory = new FlatImageLabelFactory();
+    backgroundFlatImageLabel = labelRenderFactory.getMapImageLabel(token);
+
+    // We still use the UI text so use the map label color preferences
+    if (!token.isVisible()) {
+      name.setForeground(AppPreferences.nonVisibleTokenMapLabelForeground.get());
+    } else if (token.getType() == Token.Type.NPC) {
+      name.setForeground(AppPreferences.npcMapLabelForeground.get());
+    } else {
+      name.setForeground(AppPreferences.pcMapLabelForeground.get());
+    }
     name.setFont(name.getFont().deriveFont(token.isVisible() ? Font.PLAIN : Font.ITALIC));
 
     // Show the indicator?
@@ -233,7 +240,8 @@ protected void paintComponent(Graphics g) {
       boolean initStateSecondLine = panel.isInitStateSecondLine() && panel.isShowInitState();
       Dimension s = name.getSize();
       int th = (textHeight + 2) * (initStateSecondLine ? 2 : 1);
-      backgroundImageLabel.renderLabel((Graphics2D) g, 0, (s.height - th) / 2, s.width, th);
+      // render an image label with set dimensions and without text
+      backgroundFlatImageLabel.render((Graphics2D) g, 0, (s.height - th) / 2, s.width, th, "");
       super.paintComponent(g);
     }
 
@@ -247,7 +255,7 @@ public Dimension getPreferredSize() {
       int th = textHeight * (initStateSecondLine ? 2 : 1);
       Insets insets = getInsets();
       if (getIcon() != null) th = Math.max(th, getIcon().getIconHeight());
-      s.height = th + insets.top + insets.bottom - 4;
+      s.height = th + insets.top + insets.bottom;
       return s;
     }
   }