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.

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

Update topology toolbar tooltip to include movement blocking #4773

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -662,13 +662,12 @@ public void mouseReleased(MouseEvent e) {
// MouseMotion
@Override
public void mouseMoved(MouseEvent e) {
super.mouseMoved(e);

if (renderer == null) {
return;
}
super.mouseMoved(e);

// mouseX = e.getX(); // done by super.mouseMoved()
// mouseY = e.getY();
if (isShowingPointer) {
ZonePoint zp = new ScreenPoint(mouseX, mouseY).convertToZone(renderer);
Pointer pointer =
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/rptools/maptool/client/tool/StampTool.java
Original file line number Diff line number Diff line change
Expand Up @@ -496,10 +496,11 @@ public void mouseReleased(MouseEvent e) {
*/
@Override
public void mouseMoved(MouseEvent e) {
super.mouseMoved(e);

if (renderer == null) {
return;
}
super.mouseMoved(e);

if (isShowingTokenStackPopup) {
if (tokenStackPanel.contains(e.getX(), e.getY())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,6 @@ public void mouseDragged(java.awt.event.MouseEvent e) {
}
}

@Override
public void mouseMoved(java.awt.event.MouseEvent e) {
mouseX = e.getX();
mouseY = e.getY();
}

/** A simple enum for correlating keys with directions */
private enum Direction {
Left,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ public void mouseDragged(MouseEvent e) {

@Override
public void mouseMoved(MouseEvent e) {
super.mouseMoved(e);

setIsEraser(isEraser(e));

ZonePoint p = getPoint(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ public void mouseDragged(MouseEvent e) {

@Override
public void mouseMoved(MouseEvent e) {
super.mouseMoved(e);

setIsEraser(isEraser(e));

ZonePoint zp = getPoint(e);
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ public void mouseDragged(MouseEvent e) {

@Override
public void mouseMoved(MouseEvent e) {
super.mouseMoved(e);

setIsEraser(isEraser(e));

ZonePoint zp = getPoint(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ public void mouseDragged(MouseEvent e) {
}

public void mouseMoved(MouseEvent e) {
super.mouseMoved(e);

setIsEraser(isEraser(e));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ public void mouseDragged(MouseEvent e) {

@Override
public void mouseMoved(MouseEvent e) {
super.mouseMoved(e);

setIsEraser(isEraser(e));

ZonePoint p = getPoint(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,13 @@ public void mouseDragged(MouseEvent e) {

@Override
public void mouseMoved(MouseEvent e) {
super.mouseMoved(e);

if (getLine() != null) {
if (tempPoint != null) {
removePoint(tempPoint);
}
tempPoint = addPoint(e);
}
super.mouseMoved(e);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ public void mouseDragged(MouseEvent e) {
*/
@Override
public void mouseMoved(MouseEvent e) {
super.mouseMoved(e);

if (oval != null) {

ZonePoint sp = getPoint(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ public void mouseDragged(MouseEvent e) {

@Override
public void mouseMoved(MouseEvent e) {
super.mouseMoved(e);

setIsEraser(isEraser(e));
if (oval != null) {
ZonePoint sp = getPoint(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ public void mouseDragged(MouseEvent e) {

@Override
public void mouseMoved(MouseEvent e) {
super.mouseMoved(e);

setIsEraser(isEraser(e));

ZonePoint p = getPoint(e);
Expand Down
Loading
Loading