Explicitly pass CSS stylesheets to dialogs

This ensures that dialog panes are correctly styled in accordance with whatever stylesheet the chooser is using. Fix: #4
io7m-com · Mar 28, 2020 · 25741c6 · 25741c6
1 parent 9e694ab
commit 25741c6
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 7 deletions.
diff --git a/com.io7m.jwheatsheaf.api/pom.xml b/com.io7m.jwheatsheaf.api/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.api</artifactId>

diff --git a/com.io7m.jwheatsheaf.documentation/pom.xml b/com.io7m.jwheatsheaf.documentation/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.documentation</artifactId>

diff --git a/com.io7m.jwheatsheaf.examples/pom.xml b/com.io7m.jwheatsheaf.examples/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.examples</artifactId>

diff --git a/com.io7m.jwheatsheaf.oxygen/pom.xml b/com.io7m.jwheatsheaf.oxygen/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.oxygen</artifactId>

diff --git a/com.io7m.jwheatsheaf.tests/pom.xml b/com.io7m.jwheatsheaf.tests/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.tests</artifactId>

diff --git a/com.io7m.jwheatsheaf.ui/pom.xml b/com.io7m.jwheatsheaf.ui/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.jwheatsheaf</artifactId>
     <groupId>com.io7m.jwheatsheaf</groupId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>com.io7m.jwheatsheaf.ui</artifactId>

diff --git a/...o7m.jwheatsheaf.ui/src/main/java/com/io7m/jwheatsheaf/ui/JWFileChooserViewController.java b/...o7m.jwheatsheaf.ui/src/main/java/com/io7m/jwheatsheaf/ui/JWFileChooserViewController.java
@@ -449,6 +449,13 @@ private void onSelectDirectButton()
     dialog.setTitle(this.choosers.strings().enterPathTitle());
     dialog.setHeaderText(null);
     dialog.setContentText(this.choosers.strings().enterPath());
+
+    this.configuration.cssStylesheet().ifPresent(css -> {
+      dialog.getDialogPane()
+        .getStylesheets()
+        .add(css.toExternalForm());
+    });
+
     final var nameOpt = dialog.showAndWait();
     if (nameOpt.isPresent()) {
       final var name = nameOpt.get();
@@ -477,6 +484,13 @@ private void onCreateDirectoryButton()
     dialog.setTitle(this.choosers.strings().createDirectoryTitle());
     dialog.setHeaderText(null);
     dialog.setContentText(this.choosers.strings().enterDirectoryName());
+
+    this.configuration.cssStylesheet().ifPresent(css -> {
+      dialog.getDialogPane()
+        .getStylesheets()
+        .add(css.toExternalForm());
+    });
+
     final var nameOpt = dialog.showAndWait();
     if (nameOpt.isPresent()) {
       final var name = nameOpt.get();

diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 
   <groupId>com.io7m.jwheatsheaf</groupId>
   <artifactId>com.io7m.jwheatsheaf</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>com.io7m.jwheatsheaf</name>