Merge branch 'improvement/JAL-3416_default_to_LIVE_DRAG_MODE_for_flatlaf' into merge...

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index b87a14d..50c98b4 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -1032,7 +1032,7 @@ public class Jalview
       setSystemLookAndFeel();
       if (Platform.isLinux())
       {
-        setMetalLookAndFeel();
+        setLinuxLookAndFeel();
       }
       if (Platform.isMac())
       {
@@ -1195,6 +1195,18 @@ public class Jalview
     return set;
   }
 
+  private static boolean setLinuxLookAndFeel()
+  {
+    boolean set = false;
+    set = setFlatLookAndFeel();
+    if (!set)
+      set = setMetalLookAndFeel();
+    // avoid GtkLookAndFeel -- not good results especially on HiDPI
+    if (!set)
+      set = setNimbusLookAndFeel();
+    return set;
+  }
+
   private static void showUsage()
   {
     System.out.println(

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index c120d90..6a67148 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -197,6 +197,8 @@ public class Desktop extends jalview.jbgui.GDesktop
   {
     DRAG_MODE = b ? JDesktopPane.LIVE_DRAG_MODE
             : JDesktopPane.OUTLINE_DRAG_MODE;
+    if (desktop != null)
+      desktop.setDragMode(DRAG_MODE);
   }
 
   private JalviewChangeSupport changeSupport = new JalviewChangeSupport();