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

Add persistent collapse states in orx-gui

Browse Source
This commit is contained in:
Edwin Jakobs
2020-02-04 16:19:21 +01:00
parent 84d60b4a51
commit 2af3b89d36
1 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ import org.openrndr.KEY_F11
import org.openrndr.Program
import org.openrndr.color.ColorRGBa
import org.openrndr.extra.parameters.*
import org.openrndr.internal.Driver
import org.openrndr.panel.ControlManager
import org.openrndr.panel.controlManager
import org.openrndr.panel.elements.*
@@ -12,6 +13,9 @@ import org.openrndr.panel.style.*
import kotlin.reflect.KMutableProperty1
private data class LabeledObject(val label: String, val obj: Any)
private class CollapseState(var collapsed:Boolean = false)
private val persistentCollapseStates = mutableMapOf<Long, MutableMap<String, CollapseState>>()
@Suppress("unused", "UNCHECKED_CAST")
class GUI : Extension {
@@ -90,7 +94,7 @@ class GUI : Extension {
id = "container"
div("sidebar") {
id = "sidebar"
for (( labeledObject, parameters) in trackedParams) {
for ((labeledObject, parameters) in trackedParams) {
val (label, obj) = labeledObject
val header = h3 { label }
@@ -99,12 +103,21 @@ class GUI : Extension {
addControl(obj, parameter)
}
}
val collapseClass = ElementClass("collapsed")
/* this is guaranteed to be in the dictionary after insertion through add() */
val collapseState = persistentCollapseStates[Driver.instance.contextID]!![label]!!
if (collapseState.collapsed) {
collapsible.classes.add(collapseClass)
}
header.mouse.pressed.subscribe {
val c = ElementClass("collapsed")
if (c in collapsible.classes) {
collapsible.classes.remove(c)
if (collapseClass in collapsible.classes) {
collapseState.collapsed = false
collapsible.classes.remove(collapseClass)
} else {
collapsible.classes.add(c)
collapseState.collapsed = true
collapsible.classes.add(collapseClass)
}
}
}
@@ -197,6 +210,18 @@ class GUI : Extension {
private val trackedParams = mutableMapOf<LabeledObject, List<Parameter>>()
/**
* Recursively find a unique label
* @param label to find an alternate for in case it already exist
*/
private fun resolveUniqueLabel(label: String) : String {
return trackedParams.keys.find { it.label == label }?.let { lo ->
resolveUniqueLabel(Regex("(.*) / ([0-9]+)").matchEntire(lo.label)?.let {
"${it.groupValues[1]} / ${1 + it.groupValues[2].toInt()}"
} ?: "$label / 2")
} ?: label
}
/**
* Add an object to the GUI
* @param objectWithParameters an object of a class that annotated parameters
@@ -205,8 +230,16 @@ class GUI : Extension {
*/
fun <T : Any> add(objectWithParameters: T, label: String? = objectWithParameters.title()): T {
val parameters = objectWithParameters.listParameters()
val uniqueLabel = resolveUniqueLabel(label ?: "No name")
if (parameters.isNotEmpty()) {
trackedParams[LabeledObject(label ?: "No name", objectWithParameters)] = parameters
val collapseStates = persistentCollapseStates.getOrPut(Driver.instance.contextID) {
mutableMapOf()
}
collapseStates.getOrPut(uniqueLabel) {
CollapseState()
}
trackedParams[LabeledObject(uniqueLabel, objectWithParameters)] = parameters
}
return objectWithParameters
}