From c6dfd58b69d74bd0682879aa740b556bf1bde047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Thu, 31 Dec 2020 23:14:53 +0100
Subject: [PATCH] Disable scaling (No distortion on hi-dpi monitors)

---
 CHANGELOG.md        | 3 +++
 build.xml           | 2 ++
 resources/ffdec.bat | 2 +-
 resources/ffdec.sh  | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9897bc52..4cc9db6f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,9 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Chinese translation updated
 
+### Fixed
+- Scaling - Distorted images/canvas on Hi-dpi monitors for Java 9 and later
+
 ## [11.3.0] - 2020-04-25
 ### Added
 - Possibility to open SWF files using open on Mac
diff --git a/build.xml b/build.xml
index ecb80fa4c..c63e56d08 100644
--- a/build.xml
+++ b/build.xml
@@ -405,6 +405,7 @@
                     <maxHeapPercent>${max.heap.size.percent}</maxHeapPercent>
                     <opt>-Djava.net.preferIPv4Stack=true</opt>
                     <opt>-Djna.nosys=true</opt>
+                    <opt>-Dsun.java2d.uiScale=1.0</opt>
                 </jre>
                 <splash>
                     <file>graphics/splash2.bmp</file>
@@ -667,6 +668,7 @@
         <java jar="${dist.dir}/${jar.filename}.jar" fork="true">
             <jvmarg value="-Xmx${max.heap.size.run}m" />
             <jvmarg value="-Djava.net.preferIPv4Stack=true" />
+            <jvmarg value="-Dsun.java2d.uiScale=1.0" />
             <arg line="${run.params}" />
         </java>
     </target>
diff --git a/resources/ffdec.bat b/resources/ffdec.bat
index 73c00f562..251b40c29 100644
--- a/resources/ffdec.bat
+++ b/resources/ffdec.bat
@@ -1,2 +1,2 @@
 @echo off
-java -Xmx1024m -Djna.nosys=true -jar "%~dp0\ffdec.jar" %*
\ No newline at end of file
+java -Xmx1024m -Djna.nosys=true -Dsun.java2d.uiScale=1.0 -jar "%~dp0\ffdec.jar" %*
\ No newline at end of file
diff --git a/resources/ffdec.sh b/resources/ffdec.sh
index 320c19135..19d7ec543 100644
--- a/resources/ffdec.sh
+++ b/resources/ffdec.sh
@@ -67,7 +67,7 @@ fi
 
 popd > /dev/null
 
-args=(-Djava.net.preferIPv4Stack=true -Xmx$MEMORY -jar $JAR_FILE "$@")
+args=(-Djava.net.preferIPv4Stack=true -Dsun.java2d.uiScale=1.0 -Xmx$MEMORY -jar $JAR_FILE "$@")
 
 if [ "`uname`" = "Darwin" ]; then
 	args=(-Xdock:name=FFDec -Xdock:icon=icon.png "${args[@]}")