Skip to content
Open
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 @@ -11,6 +11,8 @@
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
import software.coley.recaf.util.LayoutIndependentKeys;

import java.util.stream.Collectors;
import java.util.stream.Stream;

Expand Down Expand Up @@ -153,8 +155,7 @@ public String toString() {
*/
public boolean match(@Nonnull KeyEvent event) {
if (size() == 1)
// Simple 1-key check
return event.getCode().getName().equalsIgnoreCase(get(0));
return LayoutIndependentKeys.resolveKeyCode(event).getName().equalsIgnoreCase(get(0));
else if (size() > 1) {
// Checking binds with masks
Set<String> bindSet = new HashSet<>(this);
Expand All @@ -181,7 +182,7 @@ public static Set<String> namesOf(@Nonnull KeyEvent event) {
eventSet.add(nameOf(KeyCode.ALT));
if (event.isShiftDown())
eventSet.add(nameOf(KeyCode.SHIFT));
eventSet.add(nameOf(event.getCode()));
eventSet.add(nameOf(LayoutIndependentKeys.resolveKeyCode(event)));
return eventSet;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import software.coley.recaf.ui.control.FontIconView;
import software.coley.recaf.ui.dnd.DragAndDrop;
import software.coley.recaf.util.DirectoryChooserBuilder;
import software.coley.recaf.util.LayoutIndependentKeys;
import software.coley.recaf.util.ErrorDialogs;
import software.coley.recaf.util.FileChooserBuilder;
import software.coley.recaf.util.IOUtil;
Expand Down Expand Up @@ -335,7 +336,7 @@ public WorkspaceBuilderPane(@Nonnull PathLoadingManager pathLoadingManager,
* Key press event.
*/
private void handlePaste(KeyEvent e) {
if (e.isControlDown() && e.getCode() == KeyCode.V) {
if (LayoutIndependentKeys.isModified(e, KeyCode.V)) {
Clipboard clipboard = Clipboard.getSystemClipboard();

// Handle files
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package software.coley.recaf.util;

import jakarta.annotation.Nonnull;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;

public final class LayoutIndependentKeys {
private LayoutIndependentKeys() {
}

@Nonnull
public static KeyCode resolveKeyCode(@Nonnull KeyEvent event) {
KeyCode resolved = resolveFromControlCharacter(event);
return resolved != null ? resolved : event.getCode();
}

public static boolean isModified(@Nonnull KeyEvent event, @Nonnull KeyCode code) {
if (resolveKeyCode(event) != code)
return false;
return event.isControlDown() || event.isMetaDown();
}

private static KeyCode resolveFromControlCharacter(@Nonnull KeyEvent event) {
if (!event.isControlDown() && !event.isMetaDown())
return null;
String character = event.getCharacter();
if (character.isEmpty())
return null;
char c = character.charAt(0);
if (c < 1 || c > 26)
return null;
return NodeEvents.getKeycode((char) ('a' + c - 1));
}
}
Loading
Loading