Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#4961 #5008 #4954 Bug Fixes #5007

Merged
merged 11 commits into from
Nov 12, 2024
Merged

#4961 #5008 #4954 Bug Fixes #5007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2b9b98b
#4961 NPE on mouse off (needs testing, I can't validate)
Jmr3366 Oct 18, 2024
d289468
Merge branch 'develop' into j_develop_statsheet
Jmr3366 Oct 18, 2024
93a5297
Update StatSheet.java
Jmr3366 Oct 18, 2024
8ce7fda
Merge branch 'RPTools:develop' into j_develop_statsheet
Jmr3366 Oct 20, 2024
a6cd081
#4954 User Overlays break with new statsheets
Jmr3366 Oct 20, 2024
7acb273
#4954 User Overlays break with new statsheets
Jmr3366 Oct 21, 2024
66ecd27
#4954 User Overlays break with new statsheets
Jmr3366 Oct 21, 2024
0d7357b
Merge branch 'develop' into j_develop_statsheet
Jmr3366 Oct 26, 2024
52c8e27
Hides internal overlays from `getInfo("client")`
Jmr3366 Nov 1, 2024
f9cd9a6
Merge branch 'RPTools:develop' into j_develop_statsheet
Jmr3366 Nov 7, 2024
cb0c4d8
removed init
Jmr3366 Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/main/java/net/rptools/maptool/client/MapTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,7 @@
import net.rptools.maptool.server.ServerConfig;
import net.rptools.maptool.server.ServerPolicy;
import net.rptools.maptool.transfer.AssetTransferManager;
import net.rptools.maptool.util.MessageUtil;
import net.rptools.maptool.util.StringUtil;
import net.rptools.maptool.util.UserJvmOptions;
import net.rptools.maptool.util.*;
import net.rptools.parser.ParserException;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/net/rptools/maptool/client/functions/getInfoFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.List;
import java.util.concurrent.ConcurrentSkipListSet;
import javax.swing.*;
import net.rptools.maptool.client.AppConstants;
import net.rptools.maptool.client.AppPreferences;
import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.client.MapToolExpressionParser;
Expand Down Expand Up @@ -260,7 +261,9 @@ private JsonObject getClientInfo() {
ConcurrentSkipListSet<HTMLOverlayManager> registeredOverlays =
MapTool.getFrame().getOverlayPanel().getOverlays();
for (HTMLOverlayManager o : registeredOverlays) {
overlays.add(o.getName(), o.getProperties());
if (!o.getName().startsWith(AppConstants.INTERNAL_FRAME_PREFIX)) {
overlays.add(o.getName(), o.getProperties());
}
}
cinfo.add("overlays", overlays);

Expand Down
7 changes: 1 addition & 6 deletions src/main/java/net/rptools/maptool/client/ui/htmlframe/HTMLOverlayPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ public void showOverlay(String name, int zOrder, String html, Object frameValue)
setVisible(true);
Platform.runLater(
() -> {
boolean needsSorting = false;
HTMLOverlayManager overlayManager = getOverlay(name);
if (overlayManager != null) {
if ("".equals(html)) {
Expand All @@ -257,7 +256,6 @@ public void showOverlay(String name, int zOrder, String html, Object frameValue)
overlays.remove(overlayManager);
overlayManager.setZOrder(zOrder);
overlays.add(overlayManager);
needsSorting = true;
}
} else {
overlayManager = new HTMLOverlayManager(name, zOrder);
Expand All @@ -266,12 +264,9 @@ public void showOverlay(String name, int zOrder, String html, Object frameValue)
root.getChildren().add(overlayManager.getWebView());
if (!HTMLFrameFactory.isInternalOnly(overlayManager.getName())) {
AppMenuBar.addToOverlayMenu(overlayManager);
needsSorting = true;
}
}
if (needsSorting) {
sortOverlays();
}
sortOverlays();
overlayManager.updateContents(html, true);
if (frameValue != null) {
overlayManager.setValue(frameValue);
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/net/rptools/maptool/client/ui/sheet/stats/StatSheet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public void setContent(Token token, String content, URL entry, StatSheetLocation
.getOverlayPanel()
.showOverlay(
AppConstants.INTERNAL_MAP_UNDER_POINTER_HTML_OVERLAY_NAME,
Integer.MIN_VALUE,
Integer.MAX_VALUE,
output,
null);
}
Expand All @@ -77,7 +77,9 @@ public void clearContent() {
MapTool.getFrame()
.getOverlayPanel()
.getOverlay(AppConstants.INTERNAL_MAP_UNDER_POINTER_HTML_OVERLAY_NAME);
overlay.updateContents("", true);
if (overlay != null) {
overlay.updateContents("", true);
}
});
}
}
Loading