Updated version

This commit is contained in:
zilti 2018-11-06 10:53:31 +00:00
parent 56e94758c2
commit 0df101a279
2 changed files with 5 additions and 7 deletions

View File

@ -1,11 +1,11 @@
(defproject clojurefx/clojurefx "0.5.0-SNAPSHOT"
(defproject clojurefx/clojurefx "0.5.1-SNAPSHOT"
:description "A Clojure wrapper for JavaFX."
:license "Like Clojure."
:url "https://www.bitbucket.org/zilti/clojurefx"
:signing {:gpg-key "68484437"}
:dependencies [[org.clojure/clojure "1.9.0"]
[org.clojure/core.async "0.4.474" :scope "test"]
[org.clojars.tristefigure/shuriken "0.14.28" :scope "test"]
;;[org.clojars.tristefigure/shuriken "0.14.28" :scope "test"]
[org.openjfx/javafx-fxml "11-ea+25" :scope "test"]
[org.openjfx/javafx-swing "11-ea+25" :scope "test"]
[swiss-arrows "1.0.0"]

View File

@ -6,8 +6,7 @@
[clojure.string :as str]
[swiss.arrows :refer :all]
[clojure.spec.alpha :as s]
[clojure.pprint :refer :all]
[shuriken.macro :as sm])
[clojure.pprint :refer :all])
(:import (javafx.scene.layout Region)
(javafx.scene.shape Rectangle)
(clojurefx.ApplicationInitializer)
@ -185,8 +184,7 @@
)
(defn- graph-node-get-children [node]
{:pre [(s/valid? ::scenegraph node)]
:post [coll?]}
{:post [coll?]}
(cond (has-method? node "getChildren") (.getChildren node)
(has-method? node "getGraphic") [(.getGraphic node)]
(has-method? node "getMenus") (.getMenus node)
@ -209,7 +207,7 @@
(lazy-seq (cons (zip/node zipper) (flat-zipper (zip/next zipper))))))
(defn- has-id? [node id]
{:pre [(s/valid? ::scenegraph node) (string? id)]
{:pre [any? (string? id)]
:post [boolean?]}
(if (s/valid? ::node node)
(= id (.getId node))