Considered Gluon perfect scrolling on mobiles in getVerticalScrollbar…

…ExtraWidth()
webfx-project · Dec 8, 2023 · a38e66c · a38e66c
1 parent 8b2559f
commit a38e66c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/webfx-kit/webfx-kit-openjfx/pom.xml b/webfx-kit/webfx-kit-openjfx/pom.xml
@@ -48,6 +48,12 @@
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>dev.webfx</groupId>
+            <artifactId>webfx-platform-os</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>dev.webfx</groupId>
             <artifactId>webfx-platform-scheduler</artifactId>

diff --git a/...src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/JavaFxWebFxKitLauncherProvider.java b/...src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/JavaFxWebFxKitLauncherProvider.java
@@ -1,6 +1,7 @@
 package dev.webfx.kit.launcher.spi.impl.openjfx;
 
 import dev.webfx.kit.launcher.spi.FastPixelReaderWriter;
+import dev.webfx.platform.os.OperatingSystem;
 import javafx.application.Application;
 import javafx.application.HostServices;
 import javafx.geometry.Bounds;
@@ -19,7 +20,7 @@
  */
 public final class JavaFxWebFxKitLauncherProvider extends WebFxKitLauncherProviderBase {
 
-    private static List<Runnable> readyRunnables = new ArrayList<>();
+    private static List<Runnable> onReadyRunnables = new ArrayList<>();
     private static Factory<Application> applicationFactory;
 
     private static Stage primaryStage;
@@ -31,7 +32,8 @@ public JavaFxWebFxKitLauncherProvider() {
 
     @Override
     public double getVerticalScrollbarExtraWidth() {
-        return 16;
+        // OpenJFX has a 15px bar width on desktops, but Gluon provides a perfect scrollbar on mobiles (not introducing extra space)
+        return OperatingSystem.isMobile() ? 0 : 15;
     }
 
     @Override
@@ -66,24 +68,24 @@ private static void onJavaFxToolkitReady() {
 
     @Override
     public boolean isReady() {
-        return readyRunnables == null;
+        return onReadyRunnables == null;
     }
 
     @Override
     public void onReady(Runnable runnable) {
         synchronized (JavaFxWebFxKitLauncherProvider.class) {
-            if (readyRunnables != null)
-                readyRunnables.add(runnable);
+            if (onReadyRunnables != null)
+                onReadyRunnables.add(runnable);
             else
                 super.onReady(runnable);
         }
     }
 
     private static void executeReadyRunnables() {
         synchronized (JavaFxWebFxKitLauncherProvider.class) {
-            if (readyRunnables != null) {
-                List<Runnable> runnables = readyRunnables;
-                readyRunnables = null;
+            if (onReadyRunnables != null) {
+                List<Runnable> runnables = onReadyRunnables;
+                onReadyRunnables = null;
                 //runnables.forEach(Runnable::run); doesn't work on Android
                 for (Runnable runnable : runnables)
                     runnable.run();
@@ -128,8 +130,8 @@ public Bounds measureText(String text, Font font) {
 
     @Override
     public double measureBaselineOffset(Font font) {
-        Text text = new Text("Baseline text");
-        text.setFont(font);
-        return text.getBaselineOffset();
+        measurementText.setText("Baseline text");
+        measurementText.setFont(font);
+        return measurementText.getBaselineOffset();
     }
 }
diff --git a/webfx-kit/webfx-kit-openjfx/src/main/java/module-info.java b/webfx-kit/webfx-kit-openjfx/src/main/java/module-info.java
@@ -10,6 +10,7 @@
     requires webfx.kit.javafxgraphics.peers;
     requires webfx.kit.javafxgraphics.peers.base;
     requires webfx.kit.launcher;
+    requires webfx.platform.os;
     requires webfx.platform.scheduler;
     requires webfx.platform.uischeduler;
     requires webfx.platform.util;