Skip to content

Update 1.18 release branch with last 1.17 fix #5705

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

Merged
cwisniew merged 2 commits into from
Jul 18, 2025
Merged

Update 1.18 release branch with last 1.17 fix #5705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9327450
Force anchor position to the cell center for snap-to-grid movement
kwvanderlinde Jun 19, 2025
444cb05
Merge pull request #5605 from kwvanderlinde/bugfix/5603-bad-token-dra…
cwisniew Jun 21, 2025
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
10 changes: 9 additions & 1 deletion src/main/java/net/rptools/maptool/client/ui/zone/renderer/ZoneRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,15 @@ public void commitMoveSelectionSet(GUID keyTokenId) {
var lastPoint = tokenPath.getWayPointList().getLast();
var endPoint =
switch (lastPoint) {
case CellPoint cp -> token.getDragAnchorAsIfLocatedInCell(zone, cp);
case CellPoint cp -> {
// Anchor at the cell center.
var grid = zone.getGrid();
var zp = grid.convert(cp);
var centerOffset = grid.getCenterOffset();
zp.x += (int) centerOffset.x;
zp.y += (int) centerOffset.y;
yield zp;
}
case ZonePoint zp -> zp;
};
token.moveDragAnchorTo(zone, endPoint);
Expand Down
17 changes: 0 additions & 17 deletions src/main/java/net/rptools/maptool/model/Token.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,23 +1633,6 @@ public void moveDragAnchorTo(Zone zone, ZonePoint newDragAnchorPosition) {
setY(newDragAnchorPosition.y - offsetY);
}

/**
* Like {@link #getDragAnchor(Zone)}, but assume the token is in cell {@code cellPoint}.
*
* @param zone The zone that the token lives in.
* @param cellPoint The cell in which the token should pretend to be located.
* @return The drag anchor the token would have if located at {@code cellPoint}.
*/
public ZonePoint getDragAnchorAsIfLocatedInCell(Zone zone, CellPoint cellPoint) {
ZonePoint anchor = getDragAnchor(zone);
ZonePoint nearestGridCellVertex = zone.getGrid().convert(zone.getGrid().convert(anchor));
ZonePoint targetCellVertex = zone.getGrid().convert(cellPoint);

return new ZonePoint(
targetCellVertex.x + (anchor.x - nearestGridCellVertex.x),
targetCellVertex.y + (anchor.y - nearestGridCellVertex.y));
}

/**
* Gets the point where the token should go, if it were to be snapped to the grid.
*
Expand Down
Loading