git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
930bcaf
)
JAL-3833 cap the scaling used by HiDPISetting for incorrect DPI values or incorrect...
author
Ben Soares
<b.soares@dundee.ac.uk>
Mon, 19 Apr 2021 15:37:24 +0000
(16:37 +0100)
committer
Ben Soares
<b.soares@dundee.ac.uk>
Mon, 19 Apr 2021 15:37:24 +0000
(16:37 +0100)
src/jalview/bin/HiDPISetting.java
patch
|
blob
|
history
diff --git
a/src/jalview/bin/HiDPISetting.java
b/src/jalview/bin/HiDPISetting.java
index
497900f
..
ab5735d
100644
(file)
--- a/
src/jalview/bin/HiDPISetting.java
+++ b/
src/jalview/bin/HiDPISetting.java
@@
-35,6
+35,8
@@
public class HiDPISetting
public static int scale = 0;
public static int scale = 0;
+ public final static int MAX_SCALE = 8;
+
private static boolean doneInit = false;
private static boolean allowScalePropertyArg = false;
private static boolean doneInit = false;
private static boolean allowScalePropertyArg = false;
@@
-147,6
+149,14
@@
public class HiDPISetting
int dimensionScale = 1 + (mindimension / bigScreenThreshold);
int dimensionScale = 1 + (mindimension / bigScreenThreshold);
+ // reject outrageous values -- dpiScale in particular could be mistaken
+ if (dpiScale > MAX_SCALE) {
+ dpiScale = 1;
+ }
+ if (dimensionScale > MAX_SCALE) {
+ dimensionScale = 1;
+ }
+
// choose larger of dimensionScale or dpiScale (most likely dimensionScale
// as dpiScale often misreported)
int autoScale = Math.max(dpiScale, dimensionScale);
// choose larger of dimensionScale or dpiScale (most likely dimensionScale
// as dpiScale often misreported)
int autoScale = Math.max(dpiScale, dimensionScale);