git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
[jalview.git]
/
src
/
jalview
/
gui
/
JvOptionPane.java
diff --git
a/src/jalview/gui/JvOptionPane.java
b/src/jalview/gui/JvOptionPane.java
index
8edab03
..
7a5daf7
100644
(file)
--- a/
src/jalview/gui/JvOptionPane.java
+++ b/
src/jalview/gui/JvOptionPane.java
@@
-1334,6
+1334,7
@@
public class JvOptionPane extends JOptionPane
// A better hack which works is to create a new JFrame parent with
// setAlwaysOnTop(true)
// A better hack which works is to create a new JFrame parent with
// setAlwaysOnTop(true)
+ boolean parentOnTop = dialogParent.isAlwaysOnTop();
dialogParent.setAlwaysOnTop(true);
parentComponent = dialogParent;
dialogParent.setAlwaysOnTop(true);
parentComponent = dialogParent;
@@
-1341,6
+1342,8
@@
public class JvOptionPane extends JOptionPane
JOPTIONPANE_MESSAGETYPE, icon, options, initialValue, modal,
buttons);
JOPTIONPANE_MESSAGETYPE, icon, options, initialValue, modal,
buttons);
+ dialogParent.setAlwaysOnTop(parentOnTop);
+
if (dispose)
{
dialogParent.setAlwaysOnTop(false);
if (dispose)
{
dialogParent.setAlwaysOnTop(false);