delay opening new dialogs on startup in wayland

sparrowwallet · Sep 11, 2024 · ec131bb · ec131bb
1 parent 31f2871
commit ec131bb
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 16 deletions.
diff --git a/src/main/java/com/sparrowwallet/sparrow/AppServices.java b/src/main/java/com/sparrowwallet/sparrow/AppServices.java
@@ -573,6 +573,34 @@ public static AppController newAppWindow(Stage stage) {
         }
     }
 
+    public static void runAfterDelay(long delay, Runnable runnable) {
+        if(delay <= 0) {
+            if(Platform.isFxApplicationThread()) {
+                runnable.run();
+            } else {
+                Platform.runLater(runnable);
+            }
+        } else {
+            ScheduledService<Void> delayService = new ScheduledService<>() {
+                @Override
+                protected Task<Void> createTask() {
+                    return new Task<>() {
+                        @Override
+                        protected Void call() {
+                            return null;
+                        }
+                    };
+                }
+            };
+            delayService.setOnSucceeded(_ -> {
+                delayService.cancel();
+                runnable.run();
+            });
+            delayService.setDelay(Duration.millis(delay));
+            delayService.start();
+        }
+    }
+
     private static Image getWindowIcon() {
         if(windowIcon == null) {
             windowIcon = new Image(SparrowWallet.class.getResourceAsStream("/image/sparrow-icon.png"));
@@ -1114,6 +1142,15 @@ public static Font getMonospaceFont() {
         return Font.font("Roboto Mono", 13);
     }
 
+    public static boolean isOnWayland() {
+        if(org.controlsfx.tools.Platform.getCurrent() != org.controlsfx.tools.Platform.UNIX) {
+            return false;
+        }
+
+        String waylandDisplay = System.getenv("WAYLAND_DISPLAY");
+        return waylandDisplay != null && !waylandDisplay.isEmpty();
+    }
+
     @Subscribe
     public void newConnection(ConnectionEvent event) {
         currentBlockHeight = event.getBlockHeight();

diff --git a/src/main/java/com/sparrowwallet/sparrow/SparrowDesktop.java b/src/main/java/com/sparrowwallet/sparrow/SparrowDesktop.java
@@ -90,7 +90,8 @@ public void start(Stage stage) throws Exception {
         AppController appController = AppServices.newAppWindow(stage);
 
         final boolean showNewWallet = createNewWallet;
-        javafx.application.Platform.runLater(() -> {
+        //Delay opening new dialogs on Wayland
+        AppServices.runAfterDelay(AppServices.isOnWayland() ? 1000 : 0, () -> {
             if(showNewWallet) {
                 appController.newWallet(null);
             }

diff --git a/src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystorePane.java b/src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystorePane.java
@@ -113,23 +113,9 @@ protected void showGrid() {
                     wordEntry.getEditor().setText(words.get(i));
                     wordEntry.getEditor().setEditable(false);
                 } else {
-                    ScheduledService<Void> service = new ScheduledService<>() {
-                        @Override
-                        protected Task<Void> createTask() {
-                            return new Task<>() {
-                                @Override
-                                protected Void call() {
-                                    return null;
-                                }
-                            };
-                        }
-                    };
-                    service.setDelay(Duration.millis(500));
-                    service.setOnSucceeded(event1 -> {
-                        service.cancel();
+                    AppServices.runAfterDelay(500, () -> {
                         Platform.runLater(() -> wordEntry.getEditor().requestFocus());
                     });
-                    service.start();
                 }
             }
         }