blob: 363ce9509b431400dc42595dbeffe0deb56fc1c0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
From 173e65937d9e76872df51f7ba39c9d58986dc38f Mon Sep 17 00:00:00 2001
From: Alexey Abramov <levenson@mmer.org>
Date: Fri, 3 Jan 2020 01:17:45 +0100
Subject: [PATCH] java-openjfx-build: Cannot compile JFXPanel with JDK 8
In JDKu9 getDefaultScale method was removed and sun.java2d.SurfaceData class now
has separate getDefaultScaleX() and getDefaultScaleY() methods. See
https://bugs.openjdk.java.net/browse/JDK-8073320 for more info.
Backport the missing port to build openjfx-swing package using JDKu8. For more
info please see https://bugs.openjdk.java.net/browse/JDK-8149967
---
.../java/javafx/embed/swing/JFXPanel.java | 20 ++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java b/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java
index 97515e2290..614ed656b9 100644
--- a/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java
+++ b/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java
@@ -81,6 +81,7 @@ import sun.awt.AppContext;
import sun.awt.CausedFocusEvent;
import sun.awt.SunToolkit;
import sun.java2d.SunGraphics2D;
+import sun.java2d.SurfaceData;
import sun.util.logging.PlatformLogger;
import sun.util.logging.PlatformLogger.Level;
@@ -681,6 +682,23 @@
e.getCaret().getInsertionIndex());
}
+ // FIXME: once we move to JDK 9 as the boot JDK we should remove the
+ // reflection code from this method, consider changing it to
+ // use double rather than int, and account for the possibility of
+ // a different scale factor in X and Y.
+ private int getDefaultScale(SurfaceData surfaceData) {
+ /*
+ double scale = surfaceData.getDefaultScaleX();
+ */
+ double scale = 1;
+ try {
+ Method meth = SurfaceData.class.getMethod("getDefaultScaleX");
+ scale = (Double)meth.invoke(surfaceData);
+ } catch (Exception ex) {
+ }
+
+ return (int)Math.round(scale);
+ }
/**
* Overrides the {@link javax.swing.JComponent#paintComponent(Graphics)}
@@ -720,7 +738,7 @@ public class JFXPanel extends JComponent {
int newScaleFactor = scaleFactor;
if (g instanceof SunGraphics2D) {
- newScaleFactor = ((SunGraphics2D)g).surfaceData.getDefaultScale();
+ newScaleFactor = getDefaultScale(((SunGraphics2D)g).surfaceData);
}
if (scaleFactor != newScaleFactor) {
resizePixelBuffer(newScaleFactor);
--
2.24.1
|