Merge 1.18 changes into develop

src/main/java/net/rptools/maptool/client/DeveloperOptions.java

@@ -55,12 +55,6 @@ public static final class Toggle {
             "Preferences.developer.debugTokenDragging.label",
             "Preferences.developer.debugTokenDragging.tooltip",
             false);
-    public static final Preference<Boolean> EnableLibGdxRendererToggleButton =
-        store.defineBoolean(
-            "enableLibGDXRendererToggleButton",
-            "Preferences.developer.enableLibGDXRendererToggleButton.label",
-            "Preferences.developer.enableLibGDXRendererToggleButton.tooltip",
-            false);
 
     public static List<Preference<Boolean>> getOptions() {
       return store.getDefinedPreferences().stream()

src/main/java/net/rptools/maptool/client/tool/PointerTool.java

@@ -478,6 +478,8 @@ public void mousePressed(MouseEvent e) {
 
   @Override
   public void mouseReleased(MouseEvent e) {
+    final boolean isDraggingMap = isDraggingMap();
+
     super.mouseReleased(e);
 
     mouseButtonDown = false;
@@ -563,7 +565,7 @@ public void mouseReleased(MouseEvent e) {
     }
 
     // POPUP MENU
-    if (SwingUtilities.isRightMouseButton(e) && tokenDragOp == null && !isDraggingMap()) {
+    if (SwingUtilities.isRightMouseButton(e) && tokenDragOp == null && !isDraggingMap) {
       final var selectionModel = renderer.getSelectionModel();
       if (tokenUnderMouse != null && !selectionModel.isSelected(tokenUnderMouse.getId())) {
         if (!SwingUtil.isShiftDown(e)) {
@@ -585,7 +587,6 @@ public void mouseReleased(MouseEvent e) {
         return;
       }
     }
-    super.mouseReleased(e);
   }
 
   // //

src/main/java/net/rptools/maptool/client/tool/StampTool.java

@@ -377,6 +377,8 @@ public void mousePressed(MouseEvent e) {
 
   @Override
   public void mouseReleased(MouseEvent e) {
+    final boolean isDraggingMap = isDraggingMap();
+
     super.mouseReleased(e);
 
     if (isShowingTokenStackPopup) {
@@ -446,7 +448,7 @@ public void mouseReleased(MouseEvent e) {
       return;
     }
     // POPUP MENU
-    if (SwingUtilities.isRightMouseButton(e) && tokenDragOp == null && !isDraggingMap()) {
+    if (SwingUtilities.isRightMouseButton(e) && tokenDragOp == null && !isDraggingMap) {
       final var selectionModel = renderer.getSelectionModel();
       if (tokenUnderMouse != null && !selectionModel.isSelected(tokenUnderMouse.getId())) {
         if (!SwingUtil.isShiftDown(e)) {
@@ -469,7 +471,6 @@ public void mouseReleased(MouseEvent e) {
         return;
       }
     }
-    super.mouseReleased(e);
   }
 
   // //

src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java

@@ -14,13 +14,10 @@
  */
 package net.rptools.maptool.client.ui;
 
-import com.badlogic.gdx.backends.jogamp.JoglAwtApplicationConfiguration;
-import com.badlogic.gdx.backends.jogamp.JoglSwingCanvas;
 import com.google.common.eventbus.Subscribe;
 import com.jidesoft.docking.DefaultDockableHolder;
 import com.jidesoft.docking.DockableFrame;
 import com.jidesoft.docking.DockingManager;
-import com.jogamp.opengl.awt.GLJPanel;
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.BufferedImage;
@@ -96,7 +93,6 @@
 import net.rptools.maptool.client.ui.zone.PointerOverlay;
 import net.rptools.maptool.client.ui.zone.PointerToolOverlay;
 import net.rptools.maptool.client.ui.zone.ZoneMiniMapPanel;
-import net.rptools.maptool.client.ui.zone.gdx.GdxRenderer;
 import net.rptools.maptool.client.ui.zone.renderer.ZoneRenderer;
 import net.rptools.maptool.events.MapToolEventBus;
 import net.rptools.maptool.language.I18N;
@@ -159,8 +155,6 @@ public class MapToolFrame extends DefaultDockableHolder implements WindowListene
   /** Contains the zoneRenderer, as well as all overlays. */
   private final JPanel zoneRendererPanel;
 
-  private GLJPanel gdxPanel;
-
   private JPanel currentRenderPanel;
 
   /** Contains the overlays that should be displayed in front of everything else. */
@@ -416,11 +410,9 @@ public MapToolFrame(JMenuBar menuBar) {
     zoneRendererPanel = new JPanel(new PositionalLayout(5));
     zoneRendererPanel.setBackground(Color.black);
     currentRenderPanel = zoneRendererPanel;
-    initGdx();
 
     zoneRendererPanel.add(getChatTypingPanel(), PositionalLayout.Position.NW);
     zoneRendererPanel.add(getChatActionLabel(), PositionalLayout.Position.SW);
-    zoneRendererPanel.add(gdxPanel, PositionalLayout.Position.CENTER);
 
     commandPanel = new CommandPanel();
 
@@ -472,37 +464,6 @@ public MapToolFrame(JMenuBar menuBar) {
     setChatTypingLabelColor(AppPreferences.chatNotificationColor.get());
   }
 
-  private void initGdx() {
-    var config = new JoglAwtApplicationConfiguration();
-    // config.foregroundFPS = 300;
-    // config.backgroundFPS = 10;
-    // config.title = "maptool";
-    // config.width = 640;
-    // config.height = 480;
-    // config.samples = 1;
-    // var config = new LwjglApplicationConfiguration();
-    config.foregroundFPS = 10000;
-    config.vSyncEnabled = false;
-
-    var joglSwingCanvas = new JoglSwingCanvas(GdxRenderer.getInstance(), config);
-    // var joglSwingCanvas = new LwjglAWTCanvas(GdxRenderer.getInstance(), config);
-
-    gdxPanel = joglSwingCanvas.getGLCanvas();
-    gdxPanel.setVisible(false);
-    gdxPanel.setOpaque(false);
-    // gdxPanel.setLayout(new PositionalLayout(5));
-  }
-
-  public void switchRenderers() {
-    var isVisible = gdxPanel.isVisible();
-    gdxPanel.setVisible(!isVisible);
-    // currentRenderer.setVisible(isVisible);
-  }
-
-  public GLJPanel getGdxPanel() {
-    return gdxPanel;
-  }
-
   public ChatNotificationTimers getChatNotificationTimers() {
     return chatTyperTimers;
   }

src/main/java/net/rptools/maptool/client/ui/ToolbarPanel.java

@@ -18,7 +18,6 @@
 import java.util.Enumeration;
 import java.util.Hashtable;
 import javax.swing.*;
-import net.rptools.maptool.client.DeveloperOptions;
 import net.rptools.maptool.client.MapTool;
 import net.rptools.maptool.client.functions.MediaPlayerAdapter;
 import net.rptools.maptool.client.swing.SwingUtil;
@@ -167,8 +166,6 @@ public ToolbarPanel(Toolbox tbox) {
     tokenSelectionButtonAll.setSelected(true);
     // Jamz: End panel
 
-    add(createGdxButton(Icons.TOOLBAR_LIBGDX));
-
     // the "Select Map" button
     mapselect = createZoneSelectionButton();
     add(mapselect);
@@ -541,20 +538,6 @@ private JToggleButton createMuteButton(
     return button;
   }
 
-  private JToggleButton createGdxButton(final Icons icon) {
-    final JToggleButton button = new JToggleButton();
-    button.addActionListener(
-        e -> {
-          MapTool.getFrame().switchRenderers();
-        });
-
-    button.setIcon(RessourceManager.getBigIcon(icon));
-    button.setVisible(DeveloperOptions.Toggle.EnableLibGdxRendererToggleButton.get());
-    DeveloperOptions.Toggle.EnableLibGdxRendererToggleButton.onChange(button::setVisible);
-
-    return button;
-  }
-
   private JToggleButton createTokenSelectionButton(
       final Icons icon, final Icons offIcon, String tooltip, TokenSelection tokenSelection) {
     final JToggleButton button = new JToggleButton();

src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLContent.java

@@ -141,9 +141,8 @@ private record HtmlDocumentContent(
       document.outputSettings().charset(StandardCharsets.US_ASCII);
     }
 
-    public HtmlDocumentContent(
-        String str, boolean isJavaBridgeInjected, boolean isBaseUrlInjected) {
-      this(Jsoup.parse(str), isJavaBridgeInjected, isBaseUrlInjected);
+    public HtmlDocumentContent(String str) {
+      this(Jsoup.parse(HTMLPanelInterface.fixHTML(str)), false, false);
     }
 
     public String str() {
@@ -176,7 +175,7 @@ private HTMLContent(Content content) {
    * @return an HTMLContent object
    */
   public static HTMLContent htmlFromString(@Nonnull String html) {
-    return new HTMLContent(new HtmlDocumentContent(html, false, false));
+    return new HTMLContent(new HtmlDocumentContent(html));
   }
 
   /**
@@ -333,7 +332,7 @@ public HTMLContent fetchContent() throws IOException {
           var assetType = Asset.Type.fromMediaType(mediaType);
 
           if (assetType == Asset.Type.HTML) {
-            return new HTMLContent(new HtmlDocumentContent(html, false, false));
+            return new HTMLContent(new HtmlDocumentContent(html));
           }
           return new HTMLContent(new StringContent(html));
         }
@@ -343,7 +342,7 @@ public HTMLContent fetchContent() throws IOException {
       if (asset != null) {
         if (asset.isStringAsset()) {
           if (asset.getType() == Asset.Type.HTML) {
-            return new HTMLContent(new HtmlDocumentContent(asset.getDataAsString(), false, false));
+            return new HTMLContent(new HtmlDocumentContent(asset.getDataAsString()));
           }
           return new HTMLContent(new StringContent(asset.getDataAsString()));
         } else {