togglegroup() builder accepts property parameter (#956)

edvin · Mar 22, 2019 · 0550cac · 0550cac
1 parent 7cadc7d
commit 0550cac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - Added `cubiccurveTo` builder (/~https://github.com/edvin/tornadofx/issues/911)
 - onLeftClick() and onRightClick()
 - Convenience function builders for SimpleXXXProperty classes (/~https://github.com/edvin/tornadofx/pull/935)
+- `togglegroup()` builder accepts property parameter (/~https://github.com/edvin/tornadofx/issues/956)
 
 ## [1.7.18]
 

diff --git a/src/main/java/tornadofx/Controls.kt b/src/main/java/tornadofx/Controls.kt
@@ -237,9 +237,10 @@ fun ButtonBar.button(text: ObservableValue<String>, type: ButtonBar.ButtonData?
     op(it)
 }
 
-fun Node.togglegroup(op: ToggleGroup.() -> Unit = {}) = ToggleGroup().also {
-    properties["tornadofx.togglegroup"] = it
-    op(it)
+fun <T> Node.togglegroup(property: ObservableValue<T>? = null, op: ToggleGroup.() -> Unit = {}) = ToggleGroup().also {tg ->
+    properties["tornadofx.togglegroup"] = tg
+    property?.let { tg.bind(it) }
+    op(tg)
 }
 
 /**