fix(gui): codearea popup menu always disabled in macos (#1052) (PR #1086

)
skylot · Jan 18, 2021 · 707ed9a · 707ed9a
1 parent a3ea514
commit 707ed9a
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodeMenuAction.java b/jadx-gui/src/main/java/jadx/gui/ui/codearea/JNodeMenuAction.java
@@ -36,13 +36,11 @@ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
 
 	@Nullable
 	private T getNode() {
-		Point pos = codeArea.getMousePosition();
-		if (pos != null) {
-			Token token = codeArea.viewToToken(pos);
-			int offset = codeArea.adjustOffsetForToken(token);
-			return getNodeByOffset(offset);
-		}
-		return null;
+		Point pos = MouseInfo.getPointerInfo().getLocation();
+		SwingUtilities.convertPointFromScreen(pos, codeArea);
+		Token token = codeArea.viewToToken(pos);
+		int offset = codeArea.adjustOffsetForToken(token);
+		return getNodeByOffset(offset);
 	}
 
 	@Override