From be40fe132fe2991775bbcb5b5ed4bc86cb6b0300 Mon Sep 17 00:00:00 2001
From: Radek Davidek <rdavidek@trask.cz>
Date: Fri, 27 Mar 2026 19:33:12 +0100
Subject: [PATCH] fixed focus in password dialog

---
 .../cz/kamma/kfmanager/ui/FilePanelTab.java   | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/main/java/cz/kamma/kfmanager/ui/FilePanelTab.java b/src/main/java/cz/kamma/kfmanager/ui/FilePanelTab.java
index 206b0ce..3f1b2f4 100644
--- a/src/main/java/cz/kamma/kfmanager/ui/FilePanelTab.java
+++ b/src/main/java/cz/kamma/kfmanager/ui/FilePanelTab.java
@@ -1673,20 +1673,41 @@ public class FilePanelTab extends JPanel {
                 public String requestPassword(String archiveName) {
                     final String[] result = new String[1];
                     try {
-                        if (SwingUtilities.isEventDispatchThread()) {
-                            JPasswordField pf = new JPasswordField();
-                            int ok = JOptionPane.showConfirmDialog(FilePanelTab.this, pf, "Enter password for " + archiveName, JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
-                            if (ok == JOptionPane.OK_OPTION) {
-                                result[0] = new String(pf.getPassword());
-                            }
-                        } else {
-                            SwingUtilities.invokeAndWait(() -> {
-                                JPasswordField pf = new JPasswordField();
-                                int ok = JOptionPane.showConfirmDialog(FilePanelTab.this, pf, "Enter password for " + archiveName, JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
-                                if (ok == JOptionPane.OK_OPTION) {
-                                    result[0] = new String(pf.getPassword());
+                        Runnable showPasswordDialog = () -> {
+                            JPasswordField pf = new JPasswordField() {
+                                @Override
+                                public void addNotify() {
+                                    super.addNotify();
+                                    requestFocusInWindow();
+                                }
+                            };
+
+                            Object[] message = {
+                                    "Enter password for " + archiveName,
+                                    pf
+                            };
+
+                            JOptionPane pane = new JOptionPane(message, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
+                            JDialog dialog = pane.createDialog(FilePanelTab.this, "Password Required");
+
+                            dialog.addWindowFocusListener(new java.awt.event.WindowAdapter() {
+                                @Override
+                                public void windowGainedFocus(java.awt.event.WindowEvent e) {
+                                    pf.requestFocusInWindow();
                                 }
                             });
+
+                            dialog.setVisible(true);
+                            Object selectedValue = pane.getValue();
+                            if (selectedValue != null && (Integer) selectedValue == JOptionPane.OK_OPTION) {
+                                result[0] = new String(pf.getPassword());
+                            }
+                        };
+
+                        if (SwingUtilities.isEventDispatchThread()) {
+                            showPasswordDialog.run();
+                        } else {
+                            SwingUtilities.invokeAndWait(showPasswordDialog);
                         }
                     } catch (Exception e) {
                         result[0] = null;