akkartik
/
mu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

3946 

Fix the failing scenario of commit 3944.
This commit is contained in:
Kartik K. Agaram 2017-06-23 23:20:37 -07:00
parent 5cac8865dd
commit 3d4fb62a12
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
edit/005-sandbox.mu
View File

@ -267,7 +267,7 @@ def! render-sandbox-side screen:&:screen, env:&:environment, render-editor:rende
row, screen <- render-sandboxes screen, sandbox, left, right, row, render-from
clear-rest-of-screen screen, row, left, right
#
#? assert-no-scroll screen, old-top-idx
assert-no-scroll screen, old-top-idx
]
def render-sandboxes screen:&:screen, sandbox:&:sandbox, left:num, right:num, row:num, render-from:num, idx:num -> row:num, screen:&:screen, sandbox:&:sandbox [
@ -275,13 +275,13 @@ def render-sandboxes screen:&:screen, sandbox:&:sandbox, left:num, right:num, ro
load-ingredients
return-unless sandbox
screen-height:num <- screen-height screen
at-bottom?:bool <- greater-or-equal row, screen-height
return-if at-bottom?
hidden?:bool <- lesser-than idx, render-from
{
break-if hidden?
# render sandbox menu
row <- add row, 1
at-bottom?:bool <- greater-or-equal row, screen-height
return-if at-bottom?
screen <- move-cursor screen, row, left
screen <- render-sandbox-menu screen, idx, left, right
# save menu row so we can detect clicks to it later

6
sandbox/005-sandbox.mu
View File

@ -251,7 +251,7 @@ def! render-sandbox-side screen:&:screen, env:&:environment, render-editor:rende
row, screen <- render-sandboxes screen, sandbox, left, right, row, render-from, 0, env
clear-rest-of-screen screen, row, left, right
#
#? assert-no-scroll screen, old-top-idx
assert-no-scroll screen, old-top-idx
]
def render-sandboxes screen:&:screen, sandbox:&:sandbox, left:num, right:num, row:num, render-from:num, idx:num -> row:num, screen:&:screen, sandbox:&:sandbox [
@ -260,13 +260,13 @@ def render-sandboxes screen:&:screen, sandbox:&:sandbox, left:num, right:num, ro
env:&:environment, _/optional <- next-ingredient
return-unless sandbox
screen-height:num <- screen-height screen
at-bottom?:bool <- greater-or-equal row, screen-height
return-if at-bottom?
hidden?:bool <- lesser-than idx, render-from
{
break-if hidden?
# render sandbox menu
row <- add row, 1
at-bottom?:bool <- greater-or-equal row, screen-height
return-if at-bottom?
screen <- move-cursor screen, row, left
screen <- render-sandbox-menu screen, idx, left, right
# save menu row so we can detect clicks to it later