From 78e2bc419d5580a9d9e9b99f39107ea870392c20 Mon Sep 17 00:00:00 2001 From: jmoenig Date: Tue, 5 May 2020 16:53:22 +0200 Subject: [PATCH] fixed project recovery dialog --- src/gui.js | 11 +++++++++-- src/morphic.js | 6 ++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/gui.js b/src/gui.js index f2e117f3..b08fad7f 100644 --- a/src/gui.js +++ b/src/gui.js @@ -6838,8 +6838,9 @@ ProjectDialogMorph.prototype.clearDetails = function () { ProjectDialogMorph.prototype.recoveryDialog = function () { var proj = this.listField.selected; if (!proj) {return; } - new ProjectRecoveryDialogMorph(this.ide, proj.projectname, this).popUp(); + this.removeShadow(); this.hide(); + new ProjectRecoveryDialogMorph(this.ide, proj.projectname, this).popUp(); }; ProjectDialogMorph.prototype.openProject = function () { @@ -7278,7 +7279,9 @@ ProjectRecoveryDialogMorph.prototype.buildContents = function () { this.preview.contrast = InputFieldMorph.prototype.contrast; this.preview.render = function (ctx) { InputFieldMorph.prototype.render.call(this, ctx); - if (this.texture) { + if (this.cachedTexture) { + this.renderCachedTexture(ctx); + } else if (this.texture) { this.renderTexture(this.texture, ctx); } }; @@ -7478,6 +7481,10 @@ ProjectRecoveryDialogMorph.prototype.fixLayout = function () { this.buttons.setCenter(this.center()); this.buttons.setBottom(this.bottom() - this.padding); } + + // refresh shadow + this.removeShadow(); + this.addShadow(); }; // LibraryImportDialogMorph /////////////////////////////////////////// diff --git a/src/morphic.js b/src/morphic.js index e4a7186b..7d876f12 100644 --- a/src/morphic.js +++ b/src/morphic.js @@ -1182,7 +1182,7 @@ /*global window, HTMLCanvasElement, FileReader, Audio, FileList, Map*/ -var morphicVersion = '2020-May-01'; +var morphicVersion = '2020-May-05'; var modules = {}; // keep track of additional loaded modules var useBlurredShadows = true; @@ -8277,7 +8277,9 @@ MenuMorph.prototype.destroy = function () { if (this.hasFocus) { this.world.keyboardFocus = null; } - this.world.activeMenu = null; + if (!this.isListContents) { + this.world.activeMenu = null; + } MenuMorph.uber.destroy.call(this); };