Skip to content

Commit 7f6b615

Browse files
committed
1.9.1
1 parent 9169842 commit 7f6b615

File tree

3 files changed

+78
-47
lines changed

3 files changed

+78
-47
lines changed

deps.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{:deps {cljfx/cljfx {:mvn/version "1.7.22"}
1+
{:deps {cljfx/cljfx {:mvn/version "1.9.1"}
22
cljfx/css {:mvn/version "1.1.0"}}
33
:aliases {;; clj -T:build deploy
44
:build {:deps {io.github.clojure/tools.build {:git/tag "v0.8.2" :git/sha "ba1a2bf"}

src/cljfx/dev/definitions.clj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1069,6 +1069,10 @@
10691069
:hide-on-click {:type :boolean}}
10701070
:of 'javafx.scene.control.CustomMenuItem)
10711071

1072+
(register-composite! :separator-menu-item
1073+
:parent :custom-menu-item
1074+
:of 'javafx.scene.control.SeparatorMenuItem)
1075+
10721076
(register-composite! :cylinder
10731077
:parent :shape3d
10741078
:props '{:height {:type :number}
@@ -2671,6 +2675,7 @@
26712675
:scroll-bar "javafx.controls/javafx/scene/control/ScrollBar.html"
26722676
:scroll-pane "javafx.controls/javafx/scene/control/ScrollPane.html"
26732677
:separator "javafx.controls/javafx/scene/control/Separator.html"
2678+
:separator-menu-item "javafx.controls/javafx/scene/control/SeparatorMenuItem.html"
26742679
:sepia-tone "javafx.graphics/javafx/scene/effect/SepiaTone.html"
26752680
:sequential-transition "javafx.graphics/javafx/animation/SequentialTransition.html"
26762681
:shadow "javafx.graphics/javafx/scene/effect/Shadow.html"
@@ -2964,4 +2969,4 @@
29642969

29652970
ret)))
29662971

2967-
#_(infer-reg "directional-light")
2972+
#_(infer-reg "separator-menu-item")

src/cljfx/dev/extensions.clj

Lines changed: 71 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,72 @@
1-
(in-ns 'cljfx.dev)
2-
3-
(s/def :cljfx.ext-on-instance-lifecycle/on-created ifn?)
4-
(s/def :cljfx.ext-on-instance-lifecycle/on-advanced ifn?)
5-
(s/def :cljfx.ext-on-instance-lifecycle/on-deleted ifn?)
6-
7-
(register-type! `fx/ext-on-instance-lifecycle
8-
:spec (s/keys :opt-un [:cljfx.ext-on-instance-lifecycle/on-created
9-
:cljfx.ext-on-instance-lifecycle/on-advanced
10-
:cljfx.ext-on-instance-lifecycle/on-deleted]
11-
:req-un [:cljfx/desc])
12-
:of :desc)
13-
14-
(s/def :cljfx.ext-let-refs/refs (s/nilable (s/map-of any? :cljfx/desc)))
15-
16-
(register-type! `fx/ext-let-refs
17-
:spec (s/keys :req-un [:cljfx/desc :cljfx.ext-let-refs/refs])
18-
:of :desc)
19-
20-
(s/def :cljfx.ext-get-ref/ref any?)
21-
22-
(register-type! `fx/ext-get-ref :spec (s/keys :req-un [:cljfx.ext-get-ref/ref]))
23-
24-
(s/def :cljfx.ext-set-env/env map?)
25-
26-
(register-type! `fx/ext-set-env
27-
:spec (s/keys :req-un [:cljfx/desc :cljfx.ext-set-env/env])
28-
:of :desc)
29-
30-
(s/def :cljfx.ext-get-env/env coll?)
31-
32-
(register-type! `fx/ext-get-env
33-
:spec (s/keys :req-un [:cljfx/desc :cljfx.ext-get-env/env])
34-
:of :desc)
35-
36-
(s/def :cljfx.ext-many/desc (s/coll-of :cljfx/desc))
37-
38-
(register-type! `fx/ext-many
39-
:spec (s/keys :req-un [:cljfx.ext-many/desc])
40-
:of 'java.util.Collection)
41-
42-
(s/def :cljfx.make-ext-with-props/props (s/nilable map?))
43-
44-
(register-type! `fx/make-ext-with-props
45-
:spec (s/keys :req-un [:cljfx/desc :cljfx.make-ext-with-props/props])
1+
(in-ns 'cljfx.dev)
2+
(import '[clojure.lang IRef])
3+
4+
(s/def :cljfx.ext-on-instance-lifecycle/on-created ifn?)
5+
(s/def :cljfx.ext-on-instance-lifecycle/on-advanced ifn?)
6+
(s/def :cljfx.ext-on-instance-lifecycle/on-deleted ifn?)
7+
8+
(register-type! `fx/ext-on-instance-lifecycle
9+
:spec (s/keys :opt-un [:cljfx.ext-on-instance-lifecycle/on-created
10+
:cljfx.ext-on-instance-lifecycle/on-advanced
11+
:cljfx.ext-on-instance-lifecycle/on-deleted]
12+
:req-un [:cljfx/desc])
13+
:of :desc)
14+
15+
(s/def :cljfx.ext-let-refs/refs (s/nilable (s/map-of any? :cljfx/desc)))
16+
17+
(register-type! `fx/ext-let-refs
18+
:spec (s/keys :req-un [:cljfx/desc :cljfx.ext-let-refs/refs])
19+
:of :desc)
20+
21+
(s/def :cljfx.ext-get-ref/ref any?)
22+
23+
(register-type! `fx/ext-get-ref :spec (s/keys :req-un [:cljfx.ext-get-ref/ref]))
24+
25+
(s/def :cljfx.ext-set-env/env map?)
26+
27+
(register-type! `fx/ext-set-env
28+
:spec (s/keys :req-un [:cljfx/desc :cljfx.ext-set-env/env])
29+
:of :desc)
30+
31+
(s/def :cljfx.ext-get-env/env coll?)
32+
33+
(register-type! `fx/ext-get-env
34+
:spec (s/keys :req-un [:cljfx/desc :cljfx.ext-get-env/env])
35+
:of :desc)
36+
37+
(s/def :cljfx.ext-many/desc (s/coll-of :cljfx/desc))
38+
39+
(register-type! `fx/ext-many
40+
:spec (s/keys :req-un [:cljfx.ext-many/desc])
41+
:of 'java.util.Collection)
42+
43+
(s/def :cljfx.make-ext-with-props/props (s/nilable map?))
44+
45+
(register-type! `fx/make-ext-with-props
46+
:spec (s/keys :req-un [:cljfx/desc :cljfx.make-ext-with-props/props])
47+
:of :desc)
48+
49+
(s/def :cljfx.ext-watcher/ref (instance-of IRef))
50+
51+
(register-type! `fx/ext-watcher
52+
:spec (s/keys :req-un [:cljfx/desc :cljfx.ext-watcher/ref])
53+
:of :desc)
54+
55+
(s/def :cljfx.ext-state/initial-state any?)
56+
57+
(register-type! `fx/ext-state
58+
:spec (s/keys :req-un [:cljfx/desc :cljfx.ext-state/initial-state])
59+
:of :desc)
60+
61+
(s/def :cljfx.ext-effect/fn ifn?)
62+
(s/def :cljfx.ext-effect/args (s/nilable (s/coll-of any? :kind sequential?)))
63+
64+
(register-type! `fx/ext-effect
65+
:spec (s/keys :req-un [:cljfx/desc :cljfx.ext-effect/args :cljfx.ext-effect/fn])
66+
:of :desc)
67+
68+
(s/def :cljfx.ext-recreate-on-key-changed/key any?)
69+
70+
(register-type! `fx/ext-recreate-on-key-changed
71+
:spec (s/keys :req-un [:cljfx/desc :cljfx.ext-recreate-on-key-changed/key])
4672
:of :desc)

0 commit comments

Comments
 (0)