From: Ben Soares <b.soares@dundee.ac.uk>
Date: Wed, 9 Nov 2022 15:30:29 +0000 (+0000)
Subject: Merge branch 'bug/JAL-1988_JAL-3772_improved_quit_handling' into merge/JAL-1988_JAL... 
X-Git-Tag: Release_2_11_3_0~23^2~4^2~13
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c3ddfbdfabb6a5613a2850175cdd8d1a24195ca0;hp=-c;p=jalview.git

Merge branch 'bug/JAL-1988_JAL-3772_improved_quit_handling' into merge/JAL-1988_JAL-3772+JAL-3416+JAL-4054+JAL-4064
---

c3ddfbdfabb6a5613a2850175cdd8d1a24195ca0
diff --combined src/jalview/gui/Desktop.java
index 2605195,dfef0d2..c120d90
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@@ -191,14 -191,6 +191,14 @@@ public class Desktop extends jalview.jb
  
    public static HashMap<String, FileWriter> savingFiles = new HashMap<String, FileWriter>();
  
 +  private static int DRAG_MODE = JDesktopPane.OUTLINE_DRAG_MODE;
 +
 +  public static void setLiveDragMode(boolean b)
 +  {
 +    DRAG_MODE = b ? JDesktopPane.LIVE_DRAG_MODE
 +            : JDesktopPane.OUTLINE_DRAG_MODE;
 +  }
 +
    private JalviewChangeSupport changeSupport = new JalviewChangeSupport();
  
    public static boolean nosplash = false;
@@@ -495,7 -487,7 +495,7 @@@
      }
  
      getContentPane().add(desktop, BorderLayout.CENTER);
 -    desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
 +    desktop.setDragMode(DRAG_MODE);
  
      // This line prevents Windows Look&Feel resizing all new windows to maximum
      // if previous window was maximised
@@@ -1830,7 -1822,7 +1830,7 @@@
      saveState_actionPerformed(true);
    }
  
-   private void setProjectFile(File choice)
+   protected void setProjectFile(File choice)
    {
      this.projectFile = choice;
    }