summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmoenig <jens@moenig.org>2013-04-30 15:57:41 +0200
committerjmoenig <jens@moenig.org>2013-04-30 15:57:41 +0200
commite51a0ed7188b8361234a99781cb1d3c8ef7de62c (patch)
treed05dd792b41e8acf5526b753b0248c9466cac8ab
parent1505796e19fa90ea858fc348aa2cd79817f0aab6 (diff)
downloadsnap-byow-e51a0ed7188b8361234a99781cb1d3c8ef7de62c.tar.gz
snap-byow-e51a0ed7188b8361234a99781cb1d3c8ef7de62c.zip
Fixed #24
-rwxr-xr-xhistory.txt1
-rw-r--r--morphic.js3
2 files changed, 4 insertions, 0 deletions
diff --git a/history.txt b/history.txt
index aefd875..ad8adff 100755
--- a/history.txt
+++ b/history.txt
@@ -1691,3 +1691,4 @@ ______
* Morphic: Allow triggers to be dragged if so specified (#83)
* GUI: select dragged costume
* Blocks: eraser symbol for paint editor
+* Morphic: ScrollFrame scrollY() fix (fixes #24)
diff --git a/morphic.js b/morphic.js
index bd54d86..436edea 100644
--- a/morphic.js
+++ b/morphic.js
@@ -8705,6 +8705,9 @@ ScrollFrameMorph.prototype.scrollY = function (steps) {
}
if (newY + ch < b) {
newY = b - ch;
+ if (newY > t) {
+ newY = t;
+ }
}
if (newY !== ct) {
this.contents.setTop(newY);