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

Fix for default slider values not being emitted on load

Browse Source
This commit is contained in:
Edwin Jakobs
2020-02-11 11:45:04 +01:00
parent 33f038ab88
commit 88d321f677
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,6 @@ private fun sidebarState(): SidebarState = persistentSidebarStates.getOrPut(Driv
SidebarState() SidebarState()
} }
private fun <T : Any> getPersistedOrDefault(compartmentLabel: String, property: KMutableProperty1<Any, T>, obj: Any): T? { private fun <T : Any> getPersistedOrDefault(compartmentLabel: String, property: KMutableProperty1<Any, T>, obj: Any): T? {
val state = persistentCompartmentStates[Driver.instance.contextID]!![compartmentLabel] val state = persistentCompartmentStates[Driver.instance.contextID]!![compartmentLabel]
if (state == null) { if (state == null) {
@@ -278,6 +277,7 @@ class GUI : Extension {
} }
getPersistedOrDefault(compartment.label, parameter.property as KMutableProperty1<Any, Int>, obj)?.let { getPersistedOrDefault(compartment.label, parameter.property as KMutableProperty1<Any, Int>, obj)?.let {
value = it.toDouble() value = it.toDouble()
setAndPersist(compartment.label, parameter.property as KMutableProperty1<Any, Int>, obj, it)
} }
} }
} }
@@ -292,6 +292,9 @@ class GUI : Extension {
} }
getPersistedOrDefault(compartment.label, parameter.property as KMutableProperty1<Any, Double>, obj)?.let { getPersistedOrDefault(compartment.label, parameter.property as KMutableProperty1<Any, Double>, obj)?.let {
value = it value = it
/* this is generally not needed, but when the persisted value is equal to the slider default
it will not emit the newly set value */
setAndPersist(compartment.label, parameter.property as KMutableProperty1<Any, Double>, obj, it)
} }
} }
} }
@@ -399,8 +402,8 @@ class GUI : Extension {
} }
val json = file.readText() val json = file.readText()
val tt = object : TypeToken<Map<String, Map<String, ParameterValue>>>() {} val typeToken = object : TypeToken<Map<String, Map<String, ParameterValue>>>() {}
val labeledValues: Map<String, Map<String, ParameterValue>> = Gson().fromJson(json, tt.type) val labeledValues: Map<String, Map<String, ParameterValue>> = Gson().fromJson(json, typeToken.type)
labeledValues.forEach { (label, ps) -> labeledValues.forEach { (label, ps) ->
trackedObjects.keys.find { it.label == label }?.let { lo -> trackedObjects.keys.find { it.label == label }?.let { lo ->