From 86f6524c253759e15ff4a0bf651bc481f7923b39 Mon Sep 17 00:00:00 2001 From: therealharshit Date: Fri, 27 Sep 2024 20:17:41 +0530 Subject: [PATCH 1/2] fixes #3842 Lyric input via Phrase Maker --- js/blocks/WidgetBlocks.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/js/blocks/WidgetBlocks.js b/js/blocks/WidgetBlocks.js index d6eebb2db..7732fe80e 100644 --- a/js/blocks/WidgetBlocks.js +++ b/js/blocks/WidgetBlocks.js @@ -1394,18 +1394,20 @@ function setupWidgetBlocks(activity) { [19, ["number", { value: 100 }], 0, 0, [18]], [20, "right", 0, 0, [18, 21, 22]], [21, ["number", { value: 90 }], 0, 0, [20]], - [22, "rhythm2", 0, 0, [20, 23, 24, 27]], - [23, ["number", { value: 6 }], 0, 0, [22]], - [24, "divide", 0, 0, [22, 25, 26]], - [25, ["number", { value: 1 }], 0, 0, [24]], - [26, ["number", { value: 4 }], 0, 0, [24]], - [27, "vspace", 0, 0, [22, 28]], - [28, "rhythm2", 0, 0, [27, 29, 30, null]], - [29, ["number", { value: 1 }], 0, 0, [28]], - [30, "divide", 0, 0, [28, 31, 32]], + [22, "print", 0, 0, [20, 23, 24]], + [23, ["text", {"value":"Lyric?"}], 0, 0, [22]], + [24, "rhythm2", 0, 0, [22, 25, 26, 29]], + [25, ["number", { value: 6 }], 0, 0, [24]], + [26, "divide", 0, 0, [24, 27, 28]], + [27, ["number", { value: 1 }], 0, 0, [26]], + [28, ["number", { value: 4 }], 0, 0, [26]], + [29, "vspace", 0, 0, [24, 30]], + [30, "rhythm2", 0, 0, [29, 31, 32, null]], [31, ["number", { value: 1 }], 0, 0, [30]], - [32, ["number", { value: 2 }], 0, 0, [30]], - [33, "hiddennoflow", 0, 0, [0, null]] + [32, "divide", 0, 0, [30, 33, 34]], + [33, ["number", { value: 1 }], 0, 0, [32]], + [34, ["number", { value: 2 }], 0, 0, [32]], + [35, "hiddennoflow", 0, 0, [0, null]] ]); } From f07e7c5ef251f3721788709c513d28f475d13105 Mon Sep 17 00:00:00 2001 From: therealharshit Date: Sun, 10 Nov 2024 19:20:57 +0530 Subject: [PATCH 2/2] modify the flow of print block to knoe when it is inMatrix --- js/blocks/ExtrasBlocks.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/blocks/ExtrasBlocks.js b/js/blocks/ExtrasBlocks.js index b0a337bef..1ebb051b4 100644 --- a/js/blocks/ExtrasBlocks.js +++ b/js/blocks/ExtrasBlocks.js @@ -534,6 +534,8 @@ function setupExtrasBlocks(activity) { } } } + }else if (logo.inMatrix) { + logo.phraseMaker.addRowBlock(blk); } } }