From 6394ebc24a797555263b7f43db2b12be456b5a03 Mon Sep 17 00:00:00 2001 From: jmoenig Date: Thu, 19 Sep 2013 16:09:47 +0200 Subject: fixed #146 filter out empty costumes --- gui.js | 4 ++-- history.txt | 1 + objects.js | 1 + 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, -- cgit v1.3.1