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
JAL-3609 HiDPI scale setting done via system prop in getdown or halview.bin.Launcher
[jalview.git]
/
src
/
jalview
/
bin
/
Launcher.java
diff --git
a/src/jalview/bin/Launcher.java
b/src/jalview/bin/Launcher.java
index
fb1c5cd
..
5e6e48c
100644
(file)
--- a/
src/jalview/bin/Launcher.java
+++ b/
src/jalview/bin/Launcher.java
@@
-49,8
+49,8
@@
public class Launcher
/**
* main method for jalview.bin.Launcher. This restarts the same JRE's JVM with
/**
* main method for jalview.bin.Launcher. This restarts the same JRE's JVM with
- * the same arguments but with memory adjusted based on extracted -jvmmempc and
- * -jvmmemmax application arguments. If on a Mac then extra dock:icon and
+ * the same arguments but with memory adjusted based on extracted -jvmmempc
+ * and -jvmmemmax application arguments. If on a Mac then extra dock:icon and
* dock:name arguments are also set.
*
* @param args
* dock:name arguments are also set.
*
* @param args
@@
-130,7
+130,7
@@
public class Launcher
if (!memSet)
{
long maxMemLong = MemorySetting.getMemorySetting(jvmmemmax, jvmmempc);
if (!memSet)
{
long maxMemLong = MemorySetting.getMemorySetting(jvmmemmax, jvmmempc);
-
+
if (maxMemLong > 0)
{
memSetting = "-Xmx" + Long.toString(maxMemLong);
if (maxMemLong > 0)
{
memSetting = "-Xmx" + Long.toString(maxMemLong);
@@
-153,6
+153,12
@@
public class Launcher
}
}
}
}
+ String scalePropertyArg = HiDPISetting.getScalePropertyArg();
+ if (scalePropertyArg != null)
+ {
+ command.add(scalePropertyArg);
+ }
+
command.add(startClass);
command.addAll(arguments);
command.add(startClass);
command.addAll(arguments);
@@
-176,7
+182,8
@@
public class Launcher
if (e.getMessage().toLowerCase().contains("memory"))
{
System.out.println("Caught a memory exception: " + e.getMessage());
if (e.getMessage().toLowerCase().contains("memory"))
{
System.out.println("Caught a memory exception: " + e.getMessage());
- // Probably the "Cannot allocate memory" error, try without the memory setting
+ // Probably the "Cannot allocate memory" error, try without the memory
+ // setting
ArrayList<String> commandNoMem = new ArrayList<>();
for (int i = 0; i < command.size(); i++)
{
ArrayList<String> commandNoMem = new ArrayList<>();
for (int i = 0; i < command.size(); i++)
{