Collapsible define temperament and define mode blocks #2934

sugarlabs · May 13, 2021 · 6eef801 · 6eef801
1 parent 6763a56
commit 6eef801
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 17 deletions.
diff --git a/js/block.js b/js/block.js
@@ -79,11 +79,12 @@
 const TEXTWIDTH = 240; // 90
 const STRINGLEN = 9;
 const LONGPRESSTIME = 1500;
-const INLINECOLLAPSIBLES = ["newnote", "interval", "osctime"];
+const INLINECOLLAPSIBLES = ["newnote", "interval", "osctime", "definemode"];
 const COLLAPSIBLES = [
     "drum",
     "start",
     "action",
+    "temperament1",
     "matrix",
     "pitchdrummatrix",
     "rhythmruler2",
@@ -1440,6 +1441,13 @@ class Block {
                             platformColor.blockText
                         );
                         break;
+                    case "temperament1":
+                        that.collapseText = new createjs.Text(
+                            _("temperament"),
+                            fontSize + "px Sans",
+                            platformColor.blockText
+                        );
+                        break;
                     case "start":
                         that.collapseText = new createjs.Text(
                             _("start"),
@@ -1559,6 +1567,13 @@ class Block {
                             platformColor.blockText
                         );
                         break;
+                    case "definemode":
+                        that.collapseText = new createjs.Text(
+                            _("mode"),
+                            fontSize + "px Sans",
+                            platformColor.blockText
+                        );
+                        break;
                     default:
                         that.collapseText = new createjs.Text(
                             "foobar",

diff --git a/js/blocks/ActionBlocks.js b/js/blocks/ActionBlocks.js
@@ -867,6 +867,7 @@ function setupActionBlocks(activity) {
             this.formBlock({
                 name: _("define temperament"),
                 args: 1,
+                canCollapse: true,
                 argLabels: [""],
                 defaults: ["custom"],
                 argTypes: ["text"]

diff --git a/js/blocks/IntervalsBlocks.js b/js/blocks/IntervalsBlocks.js
@@ -625,6 +625,7 @@ function setupIntervalsBlocks(activity) {
                 //.TRANS: define a custom mode
                 name: _("define mode"),
                 args: 1,
+                canCollapse: true,
                 argTypes: ["textin"],
                 defaults: _("custom")
             });

diff --git a/js/widgets/modewidget.js b/js/widgets/modewidget.js
@@ -929,7 +929,7 @@ class ModeWidget {
                         collapsed: true
                     }
                 ],
-                100,
+                150,
                 100,
                 [null, 1, 2, null]
             ],
@@ -1018,7 +1018,9 @@ class ModeWidget {
 
         // And save a stack of pitchnumbers to be used with the define mode
         newStack = [
-            [0, "definemode", 150, 120, [null, 1, 3, 2]],
+            [0, ["definemode", {
+                collapsed: true
+            }], 150, 150, [null, 1, 3, 2]],
             [
                 1,
                 [

diff --git a/js/widgets/temperament.js b/js/widgets/temperament.js
@@ -1549,11 +1549,25 @@ function TemperamentWidget() {
         }
 
         setOctaveRatio(this.powerBase);
+
+        const len = this._logo.synth.startingPitch.length;
+        const note = this._logo.synth.startingPitch.substring(0, len - 1);
+        const octave = this._logo.synth.startingPitch.slice(-1);
+        const newStack1 = [
+            [0, "settemperament", 150, 150, [null, 1, 2, 3, null]],
+            [1, ["temperamentname", { value: this.inTemperament }], 0, 0, [0]],
+            [2, ["notename", { value: note }], 0, 0, [0]],
+            [3, ["number", { value: octave }], 0, 0, [0]]
+        ];
+        this.activity.blocks.loadNewBlocks(newStack1);
+
         const value = this.activity.blocks.findUniqueTemperamentName(this.inTemperament);
         // Change from temporary "custom" to "custom1" or "custom2" ...
         this.inTemperament = value;
         const newStack = [
-            [0, "temperament1", 100, 100, [null, 1, 2, null]],
+            [0, ["temperament1", {
+                collapsed: true
+            }], 150, 100, [null, 1, 2, null]],
             [1, ["text", { value: value }], 0, 0, [0]],
             [2, ["storein"], 0, 0, [0, 3, 4, 5]],
             [3, ["text", { value: this._logo.synth.startingPitch }], 0, 0, [2]],
@@ -1717,20 +1731,12 @@ function TemperamentWidget() {
                 previousBlock = idx + 10;
             }
         }
-        this.activity.blocks.loadNewBlocks(newStack);
-        this.activity.textMsg(_("New action block generated!"));
 
-        const len = this._logo.synth.startingPitch.length;
-        const note = this._logo.synth.startingPitch.substring(0, len - 1);
-        const octave = this._logo.synth.startingPitch.slice(-1);
-        const newStack1 = [
-            [0, "settemperament", 100, 100, [null, 1, 2, 3, null]],
-            [1, ["temperamentname", { value: this.inTemperament }], 0, 0, [0]],
-            [2, ["notename", { value: note }], 0, 0, [0]],
-            [3, ["number", { value: octave }], 0, 0, [0]]
-        ];
-        this.activity.blocks.loadNewBlocks(newStack1);
-        this.activity.textMsg(_("New action block generated!"));
+        const that = this;
+        setTimeout(() => {
+            that.activity.blocks.loadNewBlocks(newStack);
+            that.activity.textMsg(_("New action block generated!"));
+        }, 500);
 
         if (isCustomTemperament(this.inTemperament)) {
             deleteTemperamentFromList(this.inTemperament);