From 054a0c372759292ad8eefd20b7a34793062b0a42 Mon Sep 17 00:00:00 2001 From: jmoenig Date: Fri, 24 Jul 2020 13:32:01 +0200 Subject: [PATCH] tweaked IDE colors for block-fading --- HISTORY.md | 1 + src/gui.js | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 85fe5d8d..24405408 100755 --- a/HISTORY.md +++ b/HISTORY.md @@ -5,6 +5,7 @@ ### 2020-07-24 * gui: cleaned up block-fading pre-sets * updated German translation +* tweaked IDE colors for block-fading ### 2020-07-23 * morphic: fixed mouseDown events for touch devices diff --git a/src/gui.js b/src/gui.js index d60e29f0..7d6a6e80 100644 --- a/src/gui.js +++ b/src/gui.js @@ -1173,7 +1173,7 @@ IDE_Morph.prototype.createCategories = function () { this.categories = new Morph(); this.categories.color = this.groupColor; this.categories.bounds.setWidth(this.paletteWidth); - this.categories.getRenderColor = ScriptsMorph.prototype.getRenderColor; + // this.categories.getRenderColor = ScriptsMorph.prototype.getRenderColor; function addCategoryButton(category) { var labelWidth = 75, @@ -1592,7 +1592,7 @@ IDE_Morph.prototype.createSpriteBar = function () { this.spriteBar.fixLayout = function () { this.tabBar.setLeft(this.left()); - this.tabBar.setBottom(this.bottom()); + this.tabBar.setBottom(this.bottom() + myself.padding); }; }; @@ -1970,7 +1970,10 @@ IDE_Morph.prototype.fixLayout = function (situation) { // spriteEditor if (this.spriteEditor.isVisible) { - this.spriteEditor.setPosition(this.spriteBar.bottomLeft()); + this.spriteEditor.setPosition(new Point( + this.spriteBar.left(), + this.spriteBar.bottom() + padding + )); this.spriteEditor.setExtent(new Point( this.spriteBar.width(), this.bottom() - this.spriteEditor.top() @@ -8421,10 +8424,13 @@ SpriteIconMorph.prototype.render = function (ctx) { ); break; default: - this.drawBackground(ctx, this.color); + this.drawBackground(ctx, this.getRenderColor()); } }; +SpriteIconMorph.prototype.getRenderColor = + ScriptsMorph.prototype.getRenderColor; + // SpriteIconMorph drag & drop SpriteIconMorph.prototype.prepareToBeGrabbed = function () {