Turned safeAreaInsets into a JavaFX property

webfx-project · Aug 29, 2024 · 85d22b0 · 85d22b0
1 parent 634a932
commit 85d22b0
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 12 deletions.
diff --git a/...rc/main/java/dev/webfx/kit/launcher/spi/impl/gwtj2cl/GwtJ2clWebFxKitLauncherProvider.java b/...rc/main/java/dev/webfx/kit/launcher/spi/impl/gwtj2cl/GwtJ2clWebFxKitLauncherProvider.java
@@ -21,8 +21,7 @@
 import elemental2.dom.*;
 import javafx.application.Application;
 import javafx.application.HostServices;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.*;
 import javafx.collections.ObservableList;
 import javafx.geometry.BoundingBox;
 import javafx.geometry.Bounds;
@@ -257,8 +256,19 @@ public Application getApplication() {
         return application;
     }
 
+    private ObjectProperty<Insets> safeAreaInsetsProperty = null;
+
     @Override
-    public Insets getSafeAreaInsets() {
+    public ReadOnlyObjectProperty<Insets> safeAreaInsetsProperty() {
+        if (safeAreaInsetsProperty == null) {
+            safeAreaInsetsProperty = new SimpleObjectProperty<>(Insets.EMPTY);
+            FXProperties.runNowAndOnPropertiesChange(this::updateSafeAreaInsets,
+                getPrimaryStage().widthProperty(), getPrimaryStage().heightProperty());
+        }
+        return safeAreaInsetsProperty;
+    }
+
+    public void updateSafeAreaInsets() {
         /* The following code is relying on this CSS rule present in [email protected]
         :root {
             --safe-area-inset-top:    env(safe-area-inset-top);
@@ -272,11 +282,11 @@ public Insets getSafeAreaInsets() {
         String right  = computedStyle.getPropertyValue("--safe-area-inset-right");
         String bottom = computedStyle.getPropertyValue("--safe-area-inset-bottom");
         String left   = computedStyle.getPropertyValue("--safe-area-inset-left");
-        return new Insets(
-                Numbers.doubleValue(Strings.removeSuffix(top, "px")),
-                Numbers.doubleValue(Strings.removeSuffix(right, "px")),
-                Numbers.doubleValue(Strings.removeSuffix(bottom, "px")),
-                Numbers.doubleValue(Strings.removeSuffix(left, "px"))
-        );
+        safeAreaInsetsProperty.set(new Insets(
+            Numbers.doubleValue(Strings.removeSuffix(top, "px")),
+            Numbers.doubleValue(Strings.removeSuffix(right, "px")),
+            Numbers.doubleValue(Strings.removeSuffix(bottom, "px")),
+            Numbers.doubleValue(Strings.removeSuffix(left, "px"))
+        ));
     }
 }
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
@@ -7,7 +7,10 @@
 import dev.webfx.platform.util.function.Factory;
 import javafx.application.Application;
 import javafx.application.HostServices;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.geometry.Bounds;
+import javafx.geometry.Insets;
 import javafx.scene.image.Image;
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
@@ -122,7 +125,6 @@ public void start(Stage primaryStage) throws Exception {
                 application.start(primaryStage);
             }
         }
-
     }
 
     @Override
@@ -144,4 +146,11 @@ public double measureBaselineOffset(Font font) {
         measurementText.setFont(font);
         return measurementText.getBaselineOffset();
     }
+
+    private final ReadOnlyObjectProperty<Insets> safeAreaInsetsProperty = new SimpleObjectProperty<>(Insets.EMPTY);
+
+    @Override
+    public ReadOnlyObjectProperty<Insets> safeAreaInsetsProperty() {
+        return safeAreaInsetsProperty;
+    }
 }
diff --git a/webfx-kit/webfx-kit-launcher/src/main/java/dev/webfx/kit/launcher/WebFxKitLauncher.java b/webfx-kit/webfx-kit-launcher/src/main/java/dev/webfx/kit/launcher/WebFxKitLauncher.java
@@ -3,9 +3,10 @@
 import dev.webfx.kit.launcher.spi.FastPixelReaderWriter;
 import dev.webfx.kit.launcher.spi.WebFxKitLauncherProvider;
 import dev.webfx.platform.console.Console;
-import dev.webfx.platform.util.function.Factory;
 import dev.webfx.platform.service.SingleServiceProvider;
+import dev.webfx.platform.util.function.Factory;
 import javafx.application.Application;
+import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.collections.ObservableList;
 import javafx.geometry.Bounds;
 import javafx.geometry.Insets;
@@ -134,6 +135,10 @@ else if (webFxCssPath.contains(":"))
         return "dev/webfx/kit/css/" + webFxCssPath;
     }
 
+    public static ReadOnlyObjectProperty<Insets> safeAreaInsetsProperty() {
+        return getProvider().safeAreaInsetsProperty();
+    }
+
     public static Insets getSafeAreaInsets() {
         return getProvider().getSafeAreaInsets();
     }

diff --git a/...webfx-kit-launcher/src/main/java/dev/webfx/kit/launcher/spi/WebFxKitLauncherProvider.java b/...webfx-kit-launcher/src/main/java/dev/webfx/kit/launcher/spi/WebFxKitLauncherProvider.java
@@ -3,6 +3,7 @@
 import javafx.application.Application;
 import javafx.application.HostServices;
 import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.Bounds;
@@ -97,7 +98,9 @@ default ObservableList<Font> loadingFonts() {
         return FXCollections.emptyObservableList(); // Default implementation fpr synchronous font loading toolkits (such as OpenJFX)
     }
 
+    ReadOnlyObjectProperty<Insets> safeAreaInsetsProperty();
+
     default Insets getSafeAreaInsets() {
-        return Insets.EMPTY;
+        return safeAreaInsetsProperty().get();
     }
 }