diff --git a/orx-gui/src/main/kotlin/Gui.kt b/orx-gui/src/main/kotlin/Gui.kt index 9b83bb96..063de2a7 100644 --- a/orx-gui/src/main/kotlin/Gui.kt +++ b/orx-gui/src/main/kotlin/Gui.kt @@ -256,10 +256,10 @@ class GUI : Extension { collapsible.classes.add(collapseClass) } - header.mouse.pressed.subscribe { + header.mouse.pressed.listen { it.cancelPropagation() } - header.mouse.clicked.subscribe { + header.mouse.clicked.listen { if (KeyModifier.CTRL in it.modifiers) { collapsible.classes.remove(collapseClass) @@ -284,11 +284,11 @@ class GUI : Extension { } } } - collapseBorder.mouse.pressed.subscribe { + collapseBorder.mouse.pressed.listen { it.cancelPropagation() } - collapseBorder.mouse.clicked.subscribe { + collapseBorder.mouse.clicked.listen { val collapsed = ElementClass("collapsed") if (collapsed in sidebar.classes) { sidebar.classes.remove(collapsed) @@ -299,7 +299,7 @@ class GUI : Extension { } it.cancelPropagation() } - sidebar.mouse.scrolled.subscribe { + sidebar.mouse.scrolled.listen { sidebarState().scrollTop = sidebar.scrollTop } if (sidebarState().collapsed) { @@ -333,7 +333,7 @@ class GUI : Extension { label = parameter.label range = Range(parameter.intRange!!.first.toDouble(), parameter.intRange!!.last.toDouble()) precision = 0 - events.valueChanged.subscribe { + events.valueChanged.listen { setAndPersist(compartment.label, parameter.property as KMutableProperty1, obj, it.newValue.toInt()) (parameter.property as KMutableProperty1).set(obj, value.toInt()) onChangeListener?.invoke(parameter.property!!.name, it.newValue) @@ -349,7 +349,7 @@ class GUI : Extension { label = parameter.label range = Range(parameter.doubleRange!!.start, parameter.doubleRange!!.endInclusive) precision = parameter.precision!! - events.valueChanged.subscribe { + events.valueChanged.listen { setAndPersist(compartment.label, parameter.property as KMutableProperty1, obj, it.newValue) onChangeListener?.invoke(parameter.property!!.name, it.newValue) } @@ -364,7 +364,7 @@ class GUI : Extension { ParameterType.Action -> { button { label = parameter.label - events.clicked.subscribe { + events.clicked.listen { /* the `obj` we pass in here is the receiver */ parameter.function!!.call(obj) onChangeListener?.invoke(parameter.function!!.name, null) @@ -374,7 +374,7 @@ class GUI : Extension { ParameterType.Boolean -> { toggle { label = parameter.label - events.valueChanged.subscribe { + events.valueChanged.listen { value = it.newValue setAndPersist(compartment.label, parameter.property as KMutableProperty1, obj, it.newValue) onChangeListener?.invoke(parameter.property!!.name, it.newValue) @@ -388,7 +388,7 @@ class GUI : Extension { ParameterType.Text -> { textfield { label = parameter.label - events.valueChanged.subscribe { + events.valueChanged.listen { setAndPersist(compartment.label, parameter.property as KMutableProperty1, obj, it.newValue) onChangeListener?.invoke(parameter.property!!.name, it.newValue) } @@ -400,7 +400,7 @@ class GUI : Extension { ParameterType.Color -> { colorpickerButton { label = parameter.label - events.valueChanged.subscribe { + events.valueChanged.listen { setAndPersist( compartment.label, parameter.property as KMutableProperty1, @@ -429,7 +429,7 @@ class GUI : Extension { showVector = parameter.showVector!! invertY = parameter.invertY!! - events.valueChanged.subscribe { + events.valueChanged.listen { setAndPersist( compartment.label, parameter.property as KMutableProperty1,