summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmoenig <jens@moenig.org>2013-09-19 16:09:47 +0200
committerjmoenig <jens@moenig.org>2013-09-19 16:09:47 +0200
commit6394ebc24a797555263b7f43db2b12be456b5a03 (patch)
tree7a5ffd679bf7815e8c86a8f00ee7d2b3d1d3fb62
parent9450ed0511d08bce16e107a0fe5e924f289e5e88 (diff)
downloadsnap-yow-6394ebc24a797555263b7f43db2b12be456b5a03.tar.gz
snap-yow-6394ebc24a797555263b7f43db2b12be456b5a03.zip
fixed #146
filter out empty costumes
-rw-r--r--gui.js4
-rwxr-xr-xhistory.txt1
-rw-r--r--objects.js1
3 files changed, 4 insertions, 2 deletions
diff --git a/gui.js b/gui.js
index e68d62c..b9971f2 100644
--- a/gui.js
+++ b/gui.js
@@ -68,7 +68,7 @@ sb, CommentMorph, CommandBlockMorph*/
// Global stuff ////////////////////////////////////////////////////////
-modules.gui = '2013-September-18';
+modules.gui = '2013-September-19';
// Declarations
@@ -4889,7 +4889,7 @@ SpriteIconMorph.prototype.step = function () {
// SpriteIconMorph layout
SpriteIconMorph.prototype.fixLayout = function () {
- if (!this.thumbnail) {return null; }
+ if (!this.thumbnail || !this.label) {return null; }
this.setWidth(
this.thumbnail.width()
diff --git a/history.txt b/history.txt
index 2c7ceaa..591e939 100755
--- a/history.txt
+++ b/history.txt
@@ -1920,3 +1920,4 @@ ______
130919
* Objects: fixed #169 (sprites are sometimes off-placed when the project is loaded)
+* Objects, GUI: fixed #146 (filter out empty costumes)
diff --git a/objects.js b/objects.js
index e7f1bbc..13867d7 100644
--- a/objects.js
+++ b/objects.js
@@ -5239,6 +5239,7 @@ Costume.prototype.thumbnail = function (extentPoint) {
trg = newCanvas(extentPoint),
ctx = trg.getContext('2d');
+ if (!src || src.width + src.height === 0) {return trg; }
ctx.scale(scale, scale);
ctx.drawImage(
src,