Skip to content

Commit 9a12df7

Browse files
salmonbsalmonb
authored
Merge pull request #52 from kadampabookings/teavm
Moved PerfectScrollbar into separate module
2 parents 07e62df + f1df28c commit 9a12df7

File tree

23 files changed

+1724
-21
lines changed

23 files changed

+1724
-21
lines changed

‎webfx-kit/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
<module>webfx-kit-javafxweb-registry</module>
4444
<module>webfx-kit-javafxweb-registry-elemental2</module>
4545
<module>webfx-kit-launcher</module>
46+
<module>webfx-kit-perfectscrollbar-elemental2</module>
47+
<module>webfx-kit-perfectscrollbar-elemental2-gwt-j2cl</module>
48+
<module>webfx-kit-perfectscrollbar-elemental2-teavm</module>
4649
<module>webfx-kit-platform-audio-openjfx-web</module>
4750
<module>webfx-kit-platform-browser-openjfx</module>
4851
<module>webfx-kit-platform-visibility-openjfx</module>

‎webfx-kit/webfx-kit-javafxcontrols-peers-elemental2/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@
4545
<scope>provided</scope>
4646
</dependency>
4747

48-
<dependency>
49-
<groupId>com.google.jsinterop</groupId>
50-
<artifactId>jsinterop-annotations</artifactId>
51-
<scope>provided</scope>
52-
</dependency>
53-
5448
<dependency>
5549
<groupId>dev.webfx</groupId>
5650
<artifactId>webfx-kit-javafxcontrols-peers-base</artifactId>
@@ -69,6 +63,13 @@
6963
<version>0.1.0-SNAPSHOT</version>
7064
</dependency>
7165

66+
<dependency>
67+
<groupId>dev.webfx</groupId>
68+
<artifactId>webfx-kit-perfectscrollbar-elemental2</artifactId>
69+
<version>0.1.0-SNAPSHOT</version>
70+
<scope>provided</scope>
71+
</dependency>
72+
7273
<dependency>
7374
<groupId>dev.webfx</groupId>
7475
<artifactId>webfx-kit-util</artifactId>

‎webfx-kit/webfx-kit-javafxcontrols-peers-elemental2/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/elemental2/html/HtmlScrollPanePeer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import dev.webfx.kit.mapper.peers.javafxgraphics.SceneRequester;
66
import dev.webfx.kit.mapper.peers.javafxgraphics.elemental2.html.HtmlRegionPeer;
77
import dev.webfx.kit.mapper.peers.javafxgraphics.elemental2.util.HtmlUtil;
8+
import dev.webfx.kit.perfectscrollbar.elemental2.PerfectScrollbar;
89
import dev.webfx.kit.util.properties.FXProperties;
910
import dev.webfx.platform.os.OperatingSystem;
1011
import dev.webfx.platform.uischeduler.UiScheduler;

‎webfx-kit/webfx-kit-javafxcontrols-peers-elemental2/webfx.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,4 @@
99
<used-by-source-modules/>
1010
</dependencies>
1111

12-
<html if-uses-java-class="javafx.scene.control.ScrollPane">
13-
<head>
14-
<link rel="stylesheet" type="text/css" href="./dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.css"/>
15-
</head>
16-
<body>
17-
<script type="text/javascript" charset="utf-8" src="./dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.min.js"/>
18-
</body>
19-
</html>
20-
2112
</project>

‎webfx-kit/webfx-kit-javafxgraphics-peers-elemental2/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/elemental2/html/HtmlGraphicsContext.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import dev.webfx.platform.console.Console;
88
import dev.webfx.platform.util.Objects;
99
import dev.webfx.platform.util.elemental2.Elemental2Util;
10-
import elemental2.core.Function;
1110
import elemental2.core.JsArray;
1211
import elemental2.dom.*;
1312
import javafx.geometry.VPos;

‎webfx-kit/webfx-kit-javafxgraphics-peers-elemental2/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/elemental2/html/layoutmeasurable/HtmlMeasurable.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ default double prepareAndMeasureElement(HTMLElement e, boolean measureWidth, dou
114114
}
115115

116116
default double measureElement(HTMLElement e, boolean measureWidth) {
117-
// offsetWidth & offsetHeight return the correct values (including transforms), unfortunately their precision is
118-
// only integer... This diminution can cause problems (ex: text in Label wrapped to next line while it shouldn't).
117+
// offsetWidth & offsetHeight return the correct values (including transforms); unfortunately, their precision is
118+
// only integer... This diminution can cause problems (ex: text in Label wrapped to the next line while it shouldn't).
119119
int i = measureWidth ? e.offsetWidth : e.offsetHeight;
120-
// So we try to get a better precision (double) using getBoundingClientRect(), unfortunately it doesn't consider
121-
// transforms... But we will prefer it in case there is no transforms
120+
// So we try to get better precision (double) using getBoundingClientRect(), unfortunately it doesn't consider
121+
// transforms... But we will prefer it in case there are no transforms
122122
DOMRect bcr = e.getBoundingClientRect();
123123
double d = measureWidth ? bcr.width : bcr.height;
124124
if (i == (int) d) // If the double precision matches the integer precision, it's likely there is no transform,

‎webfx-kit/webfx-kit-perfectscrollbar-elemental2-gwt-j2cl/pom.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- File managed by WebFX (DO NOT EDIT MANUALLY) -->
3+
<project xmlns="http://maven.apache.org/POM/4.0.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
6+
<modelVersion>4.0.0</modelVersion>
7+
8+
<parent>
9+
<groupId>dev.webfx</groupId>
10+
<artifactId>webfx-kit</artifactId>
11+
<version>0.1.0-SNAPSHOT</version>
12+
</parent>
13+
14+
<artifactId>webfx-kit-perfectscrollbar-elemental2-gwt-j2cl</artifactId>
15+
16+
<dependencies>
17+
18+
<dependency>
19+
<groupId>com.google.jsinterop</groupId>
20+
<artifactId>base</artifactId>
21+
<scope>provided</scope>
22+
</dependency>
23+
24+
<dependency>
25+
<groupId>com.google.elemental2</groupId>
26+
<artifactId>elemental2-dom</artifactId>
27+
<scope>provided</scope>
28+
</dependency>
29+
30+
<dependency>
31+
<groupId>com.google.jsinterop</groupId>
32+
<artifactId>jsinterop-annotations</artifactId>
33+
<scope>provided</scope>
34+
</dependency>
35+
36+
</dependencies>
37+
38+
</project>

webfx-kit/webfx-kit-javafxcontrols-peers-elemental2/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/elemental2/html/PerfectScrollbar.java renamed to webfx-kit/webfx-kit-perfectscrollbar-elemental2-gwt-j2cl/src/main/java/dev/webfx/kit/perfectscrollbar/elemental2/PerfectScrollbar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.webfx.kit.mapper.peers.javafxcontrols.elemental2.html;
1+
package dev.webfx.kit.perfectscrollbar.elemental2;
22

33
import elemental2.dom.Element;
44
import jsinterop.annotations.JsConstructor;

webfx-kit/webfx-kit-javafxcontrols-peers-elemental2/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.css renamed to webfx-kit/webfx-kit-perfectscrollbar-elemental2-gwt-j2cl/src/main/resources/dev/webfx/kit/perfectscrollbar/perfect-scrollbar.css

File renamed without changes.

webfx-kit/webfx-kit-javafxcontrols-peers-elemental2/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.externs.js renamed to webfx-kit/webfx-kit-perfectscrollbar-elemental2-gwt-j2cl/src/main/resources/dev/webfx/kit/perfectscrollbar/perfect-scrollbar.externs.js

File renamed without changes.

0 commit comments

Comments
 (0)