From 87a3d3f116ffd6abb8f37820e5f475b382a51bce Mon Sep 17 00:00:00 2001 From: allem Date: Sun, 25 Nov 2018 21:49:33 -0500 Subject: [PATCH] remove lock --- ide/src/main/kotlin/befide/ide/ActionView.kt | 6 ------ ide/src/main/kotlin/befide/ide/CodeView.kt | 5 ----- ide/src/main/kotlin/befide/ide/EditorView.kt | 10 +++++----- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/ide/src/main/kotlin/befide/ide/ActionView.kt b/ide/src/main/kotlin/befide/ide/ActionView.kt index 0ea2060..2429f10 100644 --- a/ide/src/main/kotlin/befide/ide/ActionView.kt +++ b/ide/src/main/kotlin/befide/ide/ActionView.kt @@ -28,20 +28,16 @@ class ActionView(val interp: Interpreter, val codeView: CodeView, val ioView: IO } button("reset") { - enableWhen(codeView.lockedProperty) - setOnAction { interp.reset() ioView.reset() codeView.src = interp.funge.toString() - codeView.locked = false } } button("run") { setOnAction { interp.funge.setString(codeView.src) - codeView.locked = true runTimeline.rate = 10000.0 runTimeline.playFromStart() } @@ -50,7 +46,6 @@ class ActionView(val interp: Interpreter, val codeView: CodeView, val ioView: IO button("walk") { setOnAction { interp.funge.setString(codeView.src) - codeView.locked = true runTimeline.rate = 50.0 runTimeline.playFromStart() } @@ -59,7 +54,6 @@ class ActionView(val interp: Interpreter, val codeView: CodeView, val ioView: IO button("crawl") { setOnAction { interp.funge.setString(codeView.src) - codeView.locked = true runTimeline.rate = 4.0 runTimeline.playFromStart() } diff --git a/ide/src/main/kotlin/befide/ide/CodeView.kt b/ide/src/main/kotlin/befide/ide/CodeView.kt index 2fdf773..fd97d09 100644 --- a/ide/src/main/kotlin/befide/ide/CodeView.kt +++ b/ide/src/main/kotlin/befide/ide/CodeView.kt @@ -19,9 +19,6 @@ class CodeView(val interp: Interpreter) : View() { val cursorDeltaProperty = SimpleObjectProperty(Vec(1, 0)) var cursorDelta by cursorDeltaProperty - val lockedProperty = SimpleBooleanProperty(false) - var locked by lockedProperty - var labels: List> = List(25) { y -> List(80) { x -> CodeLabel(Vec(x, y), cursorPosProperty, interp) } } init { @@ -97,8 +94,6 @@ class CodeView(val interp: Interpreter) : View() { } setOnKeyTyped { - if (locked) return@setOnKeyTyped - for (ch in it.character) { when { !ch.isISOControl() -> { diff --git a/ide/src/main/kotlin/befide/ide/EditorView.kt b/ide/src/main/kotlin/befide/ide/EditorView.kt index 567a216..bc16ea1 100644 --- a/ide/src/main/kotlin/befide/ide/EditorView.kt +++ b/ide/src/main/kotlin/befide/ide/EditorView.kt @@ -23,12 +23,12 @@ class EditorView : View("Befide") { } init { - codeView.src = """>84*>:#v_55+"ude.ub@yelruta">:#,_@>188*+>\02p\12p\:22p#v_${'$'} 55+,1- v - ^ 0 v +1\ _^#-+*< >22g02g*"_@"*-!1- #v_v> - >:>::3g: ,\188 ^^ -1\g21\g22:3g" "-!v\ g30 < + |!`"O":+1_:.:03p>03g+:"O"`| + @ ^ p3\" ":< + 2 234567890123456789012345678901234567890123456789012345678901234567890123456789""" -// codeView.src = """"hello world",,,,,,,,,,@""" +// codeView.src = """"hello world",,,,,,,,,,,@""" } override fun onDock() {