use swing picker on wayland

android/.gitignore

@@ -1,4 +1,5 @@
 *.iml
+nohup.out
 .gradle
 /local.properties
 /.idea/*

android/app/.gitignore

@@ -1,4 +1,5 @@
 /build
+/nohup.out
 /.classpath
 /.project
 /.settings/

backend/.gitignore

@@ -1,4 +1,5 @@
 target/
+nohup.out
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/

desktop/.gitignore

@@ -1,4 +1,5 @@
 target/
+nohup.out
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/

desktop/src/main/java/module-info.java

@@ -2,6 +2,7 @@ module org.example.petshopdesktop {
     requires javafx.controls;
     requires javafx.fxml;
     requires javafx.web;
+    requires java.desktop;
     requires java.sql;
     requires java.net.http;
     requires com.fasterxml.jackson.databind;

desktop/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java

@@ -16,13 +16,13 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.ImagePattern;
 import javafx.scene.shape.Circle;
-import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import org.example.petshopdesktop.api.ChatRealtimeClient;
 import org.example.petshopdesktop.api.dto.auth.AvatarUploadResponse;
 import org.example.petshopdesktop.api.dto.auth.UserInfoResponse;
 import org.example.petshopdesktop.api.endpoints.AuthApi;
 import org.example.petshopdesktop.auth.UserSession;
+import org.example.petshopdesktop.util.FilePickerSupport;
 import org.example.petshopdesktop.ui.SvgWebViewFactory;
 import org.example.petshopdesktop.util.ActivityLogger;
 
@@ -206,12 +206,7 @@ public class MainLayoutController {
 
     @FXML
     void btnChangeAvatarClicked(ActionEvent event) {
-        FileChooser chooser = new FileChooser();
+        java.io.File file = FilePickerSupport.pickImageFile(btnChangeAvatar.getScene().getWindow());
-        chooser.setTitle("Choose Profile Picture");
-        chooser.getExtensionFilters().addAll(
-            new FileChooser.ExtensionFilter("Image Files", "*.png", "*.jpg", "*.jpeg", "*.gif")
-        );
-        java.io.File file = chooser.showOpenDialog(btnChangeAvatar.getScene().getWindow());
         if (file == null) {
             return;
         }

desktop/src/main/java/org/example/petshopdesktop/util/FilePickerSupport.java

@@ -0,0 +1,77 @@
+package org.example.petshopdesktop.util;
+
+import javafx.stage.FileChooser;
+import javafx.stage.Window;
+
+import javax.swing.JFileChooser;
+import javax.swing.UIManager;
+import javax.swing.filechooser.FileNameExtensionFilter;
+import java.awt.Component;
+import java.awt.GraphicsEnvironment;
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.atomic.AtomicReference;
+
+public final class FilePickerSupport {
+
+    private FilePickerSupport() {
+    }
+
+    public static File pickImageFile(Window ownerWindow) {
+        if (shouldUseAwtPicker()) {
+            return pickImageFileWithSwing();
+        }
+        return pickImageFileWithJavaFx(ownerWindow);
+    }
+
+    private static boolean shouldUseAwtPicker() {
+        if (GraphicsEnvironment.isHeadless()) {
+            return false;
+        }
+        String sessionType = System.getenv("XDG_SESSION_TYPE");
+        String waylandDisplay = System.getenv("WAYLAND_DISPLAY");
+        return "wayland".equalsIgnoreCase(sessionType) || (waylandDisplay != null && !waylandDisplay.isBlank());
+    }
+
+    private static File pickImageFileWithJavaFx(Window ownerWindow) {
+        FileChooser chooser = new FileChooser();
+        chooser.setTitle("Choose Profile Picture");
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Image Files", "*.png", "*.jpg", "*.jpeg", "*.gif"));
+        return chooser.showOpenDialog(ownerWindow);
+    }
+
+    private static File pickImageFileWithSwing() {
+        AtomicReference<File> selectedFile = new AtomicReference<>();
+        Runnable dialogTask = () -> {
+            try {
+                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            } catch (Exception ignored) {
+            }
+
+            JFileChooser chooser = new JFileChooser();
+            chooser.setDialogTitle("Choose Profile Picture");
+            chooser.setAcceptAllFileFilterUsed(false);
+            chooser.setFileFilter(new FileNameExtensionFilter("Image Files", "png", "jpg", "jpeg", "gif"));
+
+            int result = chooser.showOpenDialog((Component) null);
+            if (result == JFileChooser.APPROVE_OPTION) {
+                selectedFile.set(chooser.getSelectedFile());
+            }
+        };
+
+        try {
+            if (java.awt.EventQueue.isDispatchThread()) {
+                dialogTask.run();
+            } else {
+                java.awt.EventQueue.invokeAndWait(dialogTask);
+            }
+        } catch (InterruptedException ex) {
+            Thread.currentThread().interrupt();
+            return null;
+        } catch (InvocationTargetException ex) {
+            throw new IllegalStateException("Failed to open Swing file picker", ex.getCause());
+        }
+
+        return selectedFile.get();
+    }
+}

web/.gitignore

@@ -25,6 +25,7 @@
 *.pem
 
 # debug
+nohup.out
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*