Merge branch 'master' into release

Author: jpsacha

.gitignore

@@ -25,3 +25,4 @@ project/target
 *.sc
 .externalToolBuilders/
 /_local_/
+/.bsp/

.jvmopts

@@ -2,4 +2,3 @@
 -Xms512M
 -Xmx1536M
 -Xss2M
--XX:+CMSClassUnloadingEnabled

build.sbt

@@ -10,7 +10,7 @@ import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
 // JAR_BUILT_BY      - Name to be added to Jar metadata field "Built-By" (defaults to System.getProperty("user.name")
 //
 
-val projectVersion  = "0.3.5"
+val projectVersion  = "0.3.5.1-SNAPSHOT"
 val versionTagDir   = if (projectVersion.endsWith("SNAPSHOT")) "master" else "v." + projectVersion
 val _scalaVersions  = Seq("2.13.4", "2.12.12")
 val _scalaVersion   = _scalaVersions.head

notes/0.3.6.md

@@ -0,0 +1,18 @@
+### ScalaFX-Extras Release v.0.3.6
+
+Enhancement:
+
+* Update to ScalaFX 15.0.1-R21
+
+Bug fix:
+
+* [Issue #10][10] `Wait` cursor is not set reliably by the BusyWorker
+
+To post questions please use [ScalaFX Users Group][scalafx-users] or [StackOverflow ScalaFX][scalafx-overflow]
+
+[scalafx-users]: https://groups.google.com/forum/#!forum/scalafx-users
+
+[scalafx-overflow]: https://stackoverflow.com/questions/tagged/scalafx
+
+[10]: https://github.com/scalafx/scalafx-extras/issues/10
+

scalafx-extras/src/main/scala/org/scalafx/extras/BusyWorker.scala

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2020, ScalaFX Project
+ * Copyright (c) 2011-2021, ScalaFX Project
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,8 +27,6 @@
 
 package org.scalafx.extras
 
-import java.util.concurrent.Future
-
 import javafx.{scene => jfxs}
 import org.scalafx.extras.BusyWorker.SimpleTask
 import scalafx.Includes._
@@ -38,6 +36,7 @@ import scalafx.concurrent.Worker
 import scalafx.scene.{Cursor, Node}
 import scalafx.stage.Window
 
+import java.util.concurrent.Future
 import scala.language.implicitConversions
 import scala.util.control.NonFatal
 
@@ -432,7 +431,7 @@ class BusyWorker private(val title: String,
           nodesToDisable.foreach { node =>
             node.disable = false
             // Use Option to guard against null values
-            Option(node.scene()).map(_.root()).foreach(_.cursor = Cursor.Default)
+            Option(node.scene()).foreach(_.cursor = Cursor.Default)
           }
           busy() = false
           _busyWorkloadName = "[None]"
@@ -449,7 +448,7 @@ class BusyWorker private(val title: String,
       nodesToDisable.foreach { node =>
         node.disable = true
         // Use Option to guard against null values
-        Option(node.scene()).map(_.root()).foreach(_.cursor = Cursor.Wait)
+        Option(node.scene()).foreach(_.cursor = Cursor.Wait)
       }
     }