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

Reduce duplication in orx build scripts. (#240)

Browse Source 
Co-authored-by: hamoid <abe@hamoid.com>
This commit is contained in:
Vechro
2022-06-19 09:06:16 +03:00
committed by GitHub
parent 88719292e9
commit 9f7a4899fa
74 changed files with 646 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/SequenceEditor.kt
View File

@@ -41,6 +41,7 @@ class SequenceEditor : SequenceEditorBase("sequence-editor") {
}
}
@OptIn(DelicateCoroutinesApi::class)
open class SequenceEditorBase(type: String = "sequence-editor-base") : Element(ElementType(type)), DisposableElement {
override var disposed = false
@@ -57,8 +58,8 @@ open class SequenceEditorBase(type: String = "sequence-editor-base") : Element(E
private val footerHeight = 20.0
internal class ValueChangedEvent(val source: SequenceEditorBase,
val oldValue: List<Double>,
val newValue: List<Double>)
val oldValue: List<Double>,
val newValue: List<Double>)
internal class Events {
val valueChanged = Event<ValueChangedEvent>("sequence-editor-base-value-changed")

6
orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Slider.kt
View File

@@ -1,8 +1,6 @@
package org.openrndr.panel.elements
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.yield
import kotlinx.coroutines.*
import mu.KotlinLogging
import org.openrndr.*
import org.openrndr.draw.Cursor
@@ -291,6 +289,7 @@ class Slider : Element(ElementType("slider")), DisposableElement {
}
}
@OptIn(DelicateCoroutinesApi::class)
fun Slider.bind(property: KMutableProperty0<Double>) {
var currentValue: Double? = null
@@ -323,6 +322,7 @@ fun Slider.bind(property: KMutableProperty0<Double>) {
}
}
@OptIn(DelicateCoroutinesApi::class)
@JvmName("bindInt")
fun Slider.bind(property: KMutableProperty0<Int>) {
var currentValue: Int? = null

5
orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Textfield.kt
View File

@@ -1,13 +1,11 @@
package org.openrndr.panel.elements
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.*
import org.openrndr.KEY_BACKSPACE
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.Drawer
import org.openrndr.draw.LineCap
import org.openrndr.panel.style.*
import kotlinx.coroutines.yield
import org.openrndr.KeyModifier
import org.openrndr.draw.Cursor
import org.openrndr.draw.writer
@@ -138,6 +136,7 @@ class Textfield : Element(ElementType("textfield")), DisposableElement {
override var disposed: Boolean = false
}
@OptIn(DelicateCoroutinesApi::class)
fun Textfield.bind(property: KMutableProperty0<String>) {
GlobalScope.launch {
install@ while (!disposed) {

5
orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Toggle.kt
View File

@@ -1,14 +1,12 @@
package org.openrndr.panel.elements
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.*
import org.openrndr.draw.Drawer
import org.openrndr.draw.FontImageMap
import org.openrndr.draw.LineCap
import org.openrndr.panel.style.*
import org.openrndr.shape.Rectangle
import kotlinx.coroutines.yield
import org.openrndr.draw.Writer
import org.openrndr.events.Event
import org.openrndr.launch
@@ -100,6 +98,7 @@ class Toggle : Element(ElementType("toggle")), DisposableElement {
}
}
@OptIn(DelicateCoroutinesApi::class)
fun Toggle.bind(property: KMutableProperty0<Boolean>) {
var currentValue = property.get()
value = currentValue

2
orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/style/Matcher.kt
View File

@@ -48,7 +48,7 @@ class Matcher {
Combinator.LATER_SIBLING -> if (result == MatchingResult.RESTART_FROM_CLOSEST_DESCENDANT) {
return result
}
Combinator.DESCENDANT -> {
Combinator.DESCENDANT, null -> {
// intentionally do nothing
}
}