JAL-3048 DialogRunner changes (wip)

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index e7be765..6b7a278 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -364,6 +364,8 @@ public class Desktop extends jalview.jbgui.GDesktop
     boolean showjconsole = jalview.bin.Cache.getDefault("SHOW_JAVA_CONSOLE",
             false);
     desktop = new MyDesktopPane(selmemusage);
+    
+    
     showMemusage.setSelected(selmemusage);
     desktop.setBackground(Color.white);
     getContentPane().setLayout(new BorderLayout());
@@ -371,9 +373,19 @@ public class Desktop extends jalview.jbgui.GDesktop
     // JScrollPane sp = new JScrollPane();
     // sp.getViewport().setView(desktop);
     // getContentPane().add(sp, BorderLayout.CENTER);
+    
+    // BH 2018 - just an experiment to try unclipped JInternalFrames. 
+    // Must set for all three to be active:
+       if (Jalview.isJS()) 
+       {
+         getRootPane().putClientProperty("swingjs.overflow.hidden", "false");
+         ((JComponent) getContentPane()).putClientProperty("swingjs.overflow.hidden", "false");
+         desktop.putClientProperty("swingjs.overflow.hidden", "false");
+       }
+    
     getContentPane().add(desktop, BorderLayout.CENTER);
     desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
-
+    
     // This line prevents Windows Look&Feel resizing all new windows to maximum
     // if previous window was maximised
     desktop.setDesktopManager(new MyDesktopManager(
@@ -1113,7 +1125,7 @@ public class Desktop extends jalview.jbgui.GDesktop
             MessageManager.getString("label.open_local_file"));
     chooser.setToolTipText(MessageManager.getString("action.open"));
 
-    chooser.response(new RunResponse(JalviewFileChooser.APPROVE_OPTION)
+    chooser.addResponse(new RunResponse(JalviewFileChooser.APPROVE_OPTION)
     {
 
       @Override
@@ -1144,7 +1156,8 @@ public class Desktop extends jalview.jbgui.GDesktop
         new FileLoader().LoadFile(viewport, selectedFile,
                 DataSourceType.FILE, format);
       }
-    }).showOpenDialog(this);
+    });
+    chooser.showOpenDialog(this);
   }
 
   /**
@@ -1250,7 +1263,7 @@ public class Desktop extends jalview.jbgui.GDesktop
       }};
     String dialogOption = MessageManager
             .getString("label.input_alignment_from_url");
-    JvOptionPane.newOptionDialog(desktop).response(action)
+    JvOptionPane.newOptionDialog(desktop).addResponse(action)
             .showInternalDialog(panel, dialogOption,
                     JvOptionPane.YES_NO_CANCEL_OPTION,
                     JvOptionPane.PLAIN_MESSAGE, null, options,
@@ -1733,7 +1746,7 @@ public class Desktop extends jalview.jbgui.GDesktop
             "Jalview Project");
     chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle(MessageManager.getString("label.restore_state"));
-    chooser.response(new RunResponse(JalviewFileChooser.APPROVE_OPTION)
+    chooser.addResponse(new RunResponse(JalviewFileChooser.APPROVE_OPTION)
     {
       @Override
       public void run()