From b7ee7dcf79dbcfdeb566f758568aa6a239359c7e Mon Sep 17 00:00:00 2001 From: Nigel Fletton Date: Sun, 23 Jun 2024 18:39:46 -0300 Subject: [PATCH] Make GUI instance properties and methods accessible (#345) --- orx-jvm/orx-gui/src/main/kotlin/WindowedGUI.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/orx-jvm/orx-gui/src/main/kotlin/WindowedGUI.kt b/orx-jvm/orx-gui/src/main/kotlin/WindowedGUI.kt index c0de7045..55219a3a 100644 --- a/orx-jvm/orx-gui/src/main/kotlin/WindowedGUI.kt +++ b/orx-jvm/orx-gui/src/main/kotlin/WindowedGUI.kt @@ -16,8 +16,10 @@ class WindowedGUI( val windowAlwaysOntop: Boolean = false, ) : Extension { override var enabled: Boolean = true + val gui: GUI = GUI(appearance, defaultStyles) private val addedObjects = mutableListOf>() + fun add(objectWithParameters: T, label: String? = objectWithParameters.title()): T { addedObjects.add(Pair(objectWithParameters, label)) return objectWithParameters @@ -58,9 +60,8 @@ class WindowedGUI( // launch because at this stage Driver.instance.contextID points to the context of the parent window cw.program.launch { - val gui = GUI(appearance, defaultStyles) - for (o in addedObjects) { - gui.add(o.first, o.second) + for ((obj, label) in addedObjects) { + gui.add(obj, label) } cw.program.extend(gui) program.produceAssets.listen {