git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
dda7fb1
)
JAL-1988 Hack to ensure Quit dialog box is moved to front
author
Ben Soares
<b.soares@dundee.ac.uk>
Mon, 13 Jun 2022 17:32:22 +0000
(18:32 +0100)
committer
Ben Soares
<b.soares@dundee.ac.uk>
Mon, 13 Jun 2022 17:32:22 +0000
(18:32 +0100)
src/jalview/jbgui/APQHandlers.java
patch
|
blob
|
history
diff --git
a/src/jalview/jbgui/APQHandlers.java
b/src/jalview/jbgui/APQHandlers.java
index
27c53b9
..
e18ec44
100644
(file)
--- a/
src/jalview/jbgui/APQHandlers.java
+++ b/
src/jalview/jbgui/APQHandlers.java
@@
-20,11
+20,11
@@
*/
package jalview.jbgui;
*/
package jalview.jbgui;
+import javax.swing.JFrame;
import javax.swing.JOptionPane;
import com.formdev.flatlaf.extras.FlatDesktop;
import javax.swing.JOptionPane;
import com.formdev.flatlaf.extras.FlatDesktop;
-import jalview.gui.Desktop;
import jalview.util.MessageManager;
public class APQHandlers
import jalview.util.MessageManager;
public class APQHandlers
@@
-46,11
+46,26
@@
public class APQHandlers
int n;
if (confirmQuit)
{
int n;
if (confirmQuit)
{
- n = JOptionPane.showConfirmDialog(null,
+ // ensure Jalview window is brought to front for Quit confirmation
+ // window to be
+ // visible
+
+ // this method of raising the Jalview window is broken in java
+ // jalviewDesktop.setVisible(true);
+ // jalviewDesktop.toFront();
+
+ // a better hack which works instead
+ JFrame dialogParent = new JFrame();
+ dialogParent.setAlwaysOnTop(true);
+
+ n = JOptionPane.showConfirmDialog(dialogParent,
MessageManager.getString("label.quit_jalview"),
MessageManager.getString("action.quit"),
JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE,
null);
MessageManager.getString("label.quit_jalview"),
MessageManager.getString("action.quit"),
JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE,
null);
+
+ dialogParent.setAlwaysOnTop(false);
+ dialogParent.dispose();
}
else
{
}
else
{