From 707ed9a8284223963c29cbf7ba956ff73d306930 Mon Sep 17 00:00:00 2001 From: Shatyuka <31368738+shatyuka@users.noreply.github.com> Date: Tue, 19 Jan 2021 00:03:32 +0800 Subject: [PATCH] fix(gui): codearea popup menu always disabled in macos (#1052) (PR #1086) --- .../java/jadx/gui/ui/codearea/JNodeMenuAction.java | 12 +++++------- 1 file changed, 5 insertions(+), 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 index 65f253f77..091d15af3 100644 --- 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 abstract class JNodeMenuAction extends AbstractAction implements Popup @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