kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix what 'code clean-up' broke

Browse Source
This commit is contained in:
Edwin Jakobs
2020-03-26 19:37:50 +01:00
parent d88f258f9c
commit ebda93dc8d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
orx-gui/src/main/kotlin/Gui.kt
View File

@@ -259,7 +259,7 @@ class GUI : Extension {
header.mouse.pressed.subscribe { header.mouse.pressed.subscribe {
it.cancelPropagation() it.cancelPropagation()
} }
{ header.mouse.clicked.subscribe {
if (KeyModifier.CTRL in it.modifiers) { if (KeyModifier.CTRL in it.modifiers) {
collapsible.classes.remove(collapseClass) collapsible.classes.remove(collapseClass)
@@ -284,7 +284,7 @@ class GUI : Extension {
} }
} }
} }
{ collapseBorder.mouse.pressed.subscribe {
it.cancelPropagation() it.cancelPropagation()
} }
@@ -299,7 +299,7 @@ class GUI : Extension {
} }
it.cancelPropagation() it.cancelPropagation()
} }
{ sidebar.mouse.scrolled.subscribe {
sidebarState().scrollTop = sidebar.scrollTop sidebarState().scrollTop = sidebar.scrollTop
} }
if (sidebarState().collapsed) { if (sidebarState().collapsed) {
@@ -333,7 +333,7 @@ class GUI : Extension {
label = parameter.label label = parameter.label
range = Range(parameter.intRange!!.first.toDouble(), parameter.intRange!!.last.toDouble()) range = Range(parameter.intRange!!.first.toDouble(), parameter.intRange!!.last.toDouble())
precision = 0 precision = 0
{ events.valueChanged.subscribe {
setAndPersist(compartment.label, parameter.property as KMutableProperty1<Any, Int>, obj, it.newValue.toInt()) setAndPersist(compartment.label, parameter.property as KMutableProperty1<Any, Int>, obj, it.newValue.toInt())
(parameter.property as KMutableProperty1<Any, Int>).set(obj, value.toInt()) (parameter.property as KMutableProperty1<Any, Int>).set(obj, value.toInt())
onChangeListener?.invoke(parameter.property!!.name, it.newValue) onChangeListener?.invoke(parameter.property!!.name, it.newValue)
@@ -349,7 +349,7 @@ class GUI : Extension {
label = parameter.label label = parameter.label
range = Range(parameter.doubleRange!!.start, parameter.doubleRange!!.endInclusive) range = Range(parameter.doubleRange!!.start, parameter.doubleRange!!.endInclusive)
precision = parameter.precision!! precision = parameter.precision!!
{ events.valueChanged.subscribe {
setAndPersist(compartment.label, parameter.property as KMutableProperty1<Any, Double>, obj, it.newValue) setAndPersist(compartment.label, parameter.property as KMutableProperty1<Any, Double>, obj, it.newValue)
onChangeListener?.invoke(parameter.property!!.name, it.newValue) onChangeListener?.invoke(parameter.property!!.name, it.newValue)
} }
@@ -364,7 +364,7 @@ class GUI : Extension {
ParameterType.Action -> { ParameterType.Action -> {
button { button {
label = parameter.label label = parameter.label
{ events.clicked.subscribe {
/* the `obj` we pass in here is the receiver */ /* the `obj` we pass in here is the receiver */
parameter.function!!.call(obj) parameter.function!!.call(obj)
onChangeListener?.invoke(parameter.function!!.name, null) onChangeListener?.invoke(parameter.function!!.name, null)
@@ -374,7 +374,7 @@ class GUI : Extension {
ParameterType.Boolean -> { ParameterType.Boolean -> {
toggle { toggle {
label = parameter.label label = parameter.label
{ events.valueChanged.subscribe {
value = it.newValue value = it.newValue
setAndPersist(compartment.label, parameter.property as KMutableProperty1<Any, Boolean>, obj, it.newValue) setAndPersist(compartment.label, parameter.property as KMutableProperty1<Any, Boolean>, obj, it.newValue)
onChangeListener?.invoke(parameter.property!!.name, it.newValue) onChangeListener?.invoke(parameter.property!!.name, it.newValue)
@@ -388,7 +388,7 @@ class GUI : Extension {
ParameterType.Text -> { ParameterType.Text -> {
textfield { textfield {
label = parameter.label label = parameter.label
{ events.valueChanged.subscribe {
setAndPersist(compartment.label, parameter.property as KMutableProperty1<Any, String>, obj, it.newValue) setAndPersist(compartment.label, parameter.property as KMutableProperty1<Any, String>, obj, it.newValue)
onChangeListener?.invoke(parameter.property!!.name, it.newValue) onChangeListener?.invoke(parameter.property!!.name, it.newValue)
} }
@@ -400,7 +400,7 @@ class GUI : Extension {
ParameterType.Color -> { ParameterType.Color -> {
colorpickerButton { colorpickerButton {
label = parameter.label label = parameter.label
{ events.valueChanged.subscribe {
setAndPersist( setAndPersist(
compartment.label, compartment.label,
parameter.property as KMutableProperty1<Any, ColorRGBa>, parameter.property as KMutableProperty1<Any, ColorRGBa>,
@@ -429,7 +429,7 @@ class GUI : Extension {
showVector = parameter.showVector!! showVector = parameter.showVector!!
invertY = parameter.invertY!! invertY = parameter.invertY!!
{ events.valueChanged.subscribe {
setAndPersist( setAndPersist(
compartment.label, compartment.label,
parameter.property as KMutableProperty1<Any, Vector2>, parameter.property as KMutableProperty1<Any, Vector2>,