diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java index f12dbcbb..dc497c43 100644 --- a/src/main/java/com/sparrowwallet/sparrow/AppController.java +++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java @@ -446,39 +446,26 @@ public class AppController implements Initializable { } else if(event.getCode() == KeyCode.RIGHT && currentIndex < tabs.getTabs().size() - 1) { tabs.getSelectionModel().select(currentIndex + 1); } - } - }); - - // MSC: move tabs by keyboard - tabs.getScene().addEventFilter(KeyEvent.KEY_PRESSED, event -> { - if (event.isControlDown() && event.isShiftDown() && (event.getCode() == KeyCode.LEFT || event.getCode() == KeyCode.RIGHT)){ + } else if (event.isControlDown() && event.isShiftDown() && (event.getCode() == KeyCode.LEFT || event.getCode() == KeyCode.RIGHT)){ boolean moveLeft = event.getCode() == KeyCode.LEFT; int currentIndex = tabs.getSelectionModel().getSelectedIndex(); - if (moveLeft && currentIndex == 0) return; if (!moveLeft && currentIndex + 1 >= tabs.getTabs().size()) return; - Tab selectedTab = tabs.getSelectionModel().getSelectedItem(); tabs.getTabs().removeListener(tabsChangeListener); tabs.getTabs().remove(selectedTab); - if (moveLeft) tabs.getTabs().add(currentIndex - 1, selectedTab); else tabs.getTabs().add(currentIndex + 1, selectedTab); - tabs.getTabs().addListener(tabsChangeListener); tabs.getSelectionModel().select(selectedTab); EventManager.get().post(new RequestOpenWalletsEvent()); //Rearrange recent files list } }); - } - - - } private void setPlatformApplicationMenu() {