diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2015-07-10 15:59:21 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2015-07-10 15:59:21 -0700 |
| commit | a640823bfcef239aa72238c9de5a51f60e2ea26e (patch) | |
| tree | 4fb74ab9f09cfc00ba42c2b8674ac50d2c0cdbfa | |
| parent | 885315fe8858f8a4963eaf6f1f8a778d961aedd3 (diff) | |
| download | mu-a640823bfcef239aa72238c9de5a51f60e2ea26e.tar.gz | |
1752 - cursor positioning fixed
| -rw-r--r-- | edit.mu | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/edit.mu b/edit.mu index 114efd2a..aae08314 100644 --- a/edit.mu +++ b/edit.mu @@ -460,7 +460,7 @@ recipe event-loop [ env:address:programming-environment-data <- next-ingredient recipes:address:editor-data <- get env:address:programming-environment-data/deref, recipes:offset current-sandbox:address:editor-data <- get env:address:programming-environment-data/deref, current-sandbox:offset - sandbox-in-focus?:boolean <- get env:address:programming-environment-data/deref, sandbox-in-focus?:offset + sandbox-in-focus?:address:boolean <- get-address env:address:programming-environment-data/deref, sandbox-in-focus?:offset { # looping over each (keyboard or touch) event as it occurs +next-event @@ -485,17 +485,17 @@ recipe event-loop [ t:address:touch-event <- maybe-convert e:event, touch:variant break-unless t:address:touch-event _ <- move-cursor-in-editor screen:address, recipes:address:editor-data, t:address:touch-event/deref - sandbox-in-focus?:boolean <- move-cursor-in-editor screen:address, current-sandbox:address:editor-data, t:address:touch-event/deref + sandbox-in-focus?:address:boolean/deref <- move-cursor-in-editor screen:address, current-sandbox:address:editor-data, t:address:touch-event/deref jump +continue:label } # if it's not global, send to appropriate editor { { - break-if sandbox-in-focus?:boolean + break-if sandbox-in-focus?:address:boolean/deref handle-event screen:address, console:address, recipes:address:editor-data, e:event } { - break-unless sandbox-in-focus?:boolean + break-unless sandbox-in-focus?:address:boolean/deref handle-event screen:address, console:address, current-sandbox:address:editor-data, e:event } } @@ -862,13 +862,15 @@ recipe update-cursor [ sandbox-in-focus?:boolean <- next-ingredient { break-if sandbox-in-focus?:boolean -#? trace [app], [recipes in focus] #? 1 +#? $print [recipes in focus +#? ] #? 1 cursor-row:number <- get recipes:address:editor-data/deref, cursor-row:offset cursor-column:number <- get recipes:address:editor-data/deref, cursor-column:offset } { break-unless sandbox-in-focus?:boolean -#? trace [app], [sandbox in focus] #? 1 +#? $print [sandboxes in focus +#? ] #? 1 cursor-row:number <- get current-sandbox:address:editor-data/deref, cursor-row:offset cursor-column:number <- get current-sandbox:address:editor-data/deref, cursor-column:offset } |