diff --git a/HISTORY.md b/HISTORY.md index 44b506c5..531c9ce9 100755 --- a/HISTORY.md +++ b/HISTORY.md @@ -4,6 +4,7 @@ ### 2020-07-21 * blocks: tweaked block highlights for fade-out +* widgets, gui: tweaked scripts tab for fade-out ### 2020-07-20 * objects: fixed a list-watcher direct-editing offset bug diff --git a/snap.html b/snap.html index 6760f06a..5066e3a3 100755 --- a/snap.html +++ b/snap.html @@ -6,11 +6,11 @@ - + - + diff --git a/src/gui.js b/src/gui.js index 920c5dbf..4dce229f 100644 --- a/src/gui.js +++ b/src/gui.js @@ -78,7 +78,7 @@ Animation, BoxMorph, BlockEditorMorph, BlockDialogMorph, Note, ZERO, BLACK*/ // Global stuff //////////////////////////////////////////////////////// -modules.gui = '2020-July-19'; +modules.gui = '2020-July-21'; // Declarations @@ -1533,6 +1533,17 @@ IDE_Morph.prototype.createSpriteBar = function () { tab.labelShadowOffset = new Point(-1, -1); tab.labelShadowColor = tabColors[1]; tab.labelColor = this.buttonLabelColor; + + tab.getPressRenderColor = function () { + if (MorphicPreferences.isFlat) { + return this.pressColor; + } + return this.pressColor.lighter(12.5).mixed( + Math.max(SyntaxElementMorph.prototype.alpha - 0.15, 0), + BLACK + ); + }; + tab.fixLayout(); tabBar.add(tab); diff --git a/src/widgets.js b/src/widgets.js index 641b9a00..c64e7f89 100644 --- a/src/widgets.js +++ b/src/widgets.js @@ -85,7 +85,7 @@ HTMLCanvasElement, fontHeight, SymbolMorph, localize, SpeechBubbleMorph, ArrowMorph, MenuMorph, isString, isNil, SliderMorph, MorphicPreferences, ScrollFrameMorph, MenuItemMorph, Note*/ -modules.widgets = '2020-July-13'; +modules.widgets = '2020-July-21'; var PushButtonMorph; var ToggleButtonMorph; @@ -728,7 +728,7 @@ ToggleButtonMorph.prototype.render = function (ctx) { // note: don't invert the 3D-ish edges for 'pressed' state, because // it will stay that way, and should not look inverted (or should it?) this.drawOutline(ctx); - this.drawBackground(ctx, this.pressColor); + this.drawBackground(ctx, this.getPressRenderColor()); this.drawEdges( ctx, this.pressColor, @@ -748,6 +748,11 @@ ToggleButtonMorph.prototype.render = function (ctx) { } }; +ToggleButtonMorph.prototype.getPressRenderColor = function () { + // can be overridden by my children + return this.pressColor; +}; + ToggleButtonMorph.prototype.drawEdges = function ( ctx, color,