Merge branch 'merge/develop_and_rebase_squashed_merge_JAL-3628+JAL-3608+JAL-3609...

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index d49ee40..b38a5a2 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -25,6 +25,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.GridLayout;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -47,6 +48,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.awt.geom.AffineTransform;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
@@ -160,6 +162,8 @@ public class Desktop extends jalview.jbgui.GDesktop
 
   private JalviewChangeSupport changeSupport = new JalviewChangeSupport();
 
+  public static boolean nosplash = false;
+
   /**
    * news reader - null if it was never started.
    */
@@ -462,15 +466,17 @@ public class Desktop extends jalview.jbgui.GDesktop
       checkURLLinks();
 
       // Spawn a thread that shows the splashscreen
-
-      SwingUtilities.invokeLater(new Runnable()
+      if (!nosplash)
       {
-        @Override
-        public void run()
+        SwingUtilities.invokeLater(new Runnable()
         {
-          new SplashScreen(true);
-        }
-      });
+          @Override
+          public void run()
+          {
+            new SplashScreen(true);
+          }
+        });
+      }
 
       // Thread off a new instance of the file chooser - this reduces the time
       // it
@@ -535,7 +541,6 @@ public class Desktop extends jalview.jbgui.GDesktop
       }
     });
     desktop.addMouseListener(ma);
-
   }
 
   /**
@@ -1622,7 +1627,7 @@ public class Desktop extends jalview.jbgui.GDesktop
   @Override
   protected void preferences_actionPerformed(ActionEvent e)
   {
-    new Preferences();
+    Preferences.openPreferences();
   }
 
   /**
@@ -2280,6 +2285,9 @@ public class Desktop extends jalview.jbgui.GDesktop
                   10, getHeight() - fm.getHeight());
         }
       }
+
+      // output debug scale message. Important for jalview.bin.HiDPISettingTest2
+      Desktop.debugScaleMessage(Desktop.getDesktop().getGraphics());
     }
   }
 
@@ -3369,4 +3377,37 @@ public class Desktop extends jalview.jbgui.GDesktop
     }
     return result;
   }
+
+  public static final String debugScaleMessage = "Desktop graphics transform scale=";
+
+  private static boolean debugScaleMessageDone = false;
+
+  public static void debugScaleMessage(Graphics g)
+  {
+    if (debugScaleMessageDone)
+    {
+      return;
+    }
+    // output used by tests to check HiDPI scaling settings in action
+    try
+    {
+      Graphics2D gg = (Graphics2D) g;
+      if (gg != null)
+      {
+        AffineTransform t = gg.getTransform();
+        double scaleX = t.getScaleX();
+        double scaleY = t.getScaleY();
+        Cache.debug(debugScaleMessage + scaleX + " (X)");
+        Cache.debug(debugScaleMessage + scaleY + " (Y)");
+        debugScaleMessageDone = true;
+      }
+      else
+      {
+        Cache.debug("Desktop graphics null");
+      }
+    } catch (Exception e)
+    {
+      Cache.debug(Cache.getStackTraceString(e));
+    }
+  }
 }