Merge branch 'develop' into develop-builds

TurboWarp · Jan 21, 2024 · 409effa · 409effa
2 parents ff61b18 + fc97dd1
commit 409effa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/core/data_category.js b/core/data_category.js
@@ -52,7 +52,7 @@ Blockly.DataCategory = function(workspace) {
   }
 
   if (variableModelList.length > 0) {
-    xmlList[xmlList.length - 1].setAttribute('gap', 24);
+    xmlList[xmlList.length - 1].setAttribute('gap', 28);
     var firstVariable = variableModelList[0];
 
     Blockly.DataCategory.addSetVariableTo(xmlList, firstVariable);
@@ -70,7 +70,7 @@ Blockly.DataCategory = function(workspace) {
   }
 
   if (variableModelList.length > 0) {
-    xmlList[xmlList.length - 1].setAttribute('gap', 24);
+    xmlList[xmlList.length - 1].setAttribute('gap', 28);
     var firstVariable = variableModelList[0];
 
     Blockly.DataCategory.addAddToList(xmlList, firstVariable);
@@ -430,7 +430,7 @@ Blockly.DataCategory.addBlock = function(xmlList, variable, blockType,
           opt_secondValue[1], opt_secondValue[2]);
     }
 
-    var gap = 8;
+    var gap = 10;
     var blockText = '<xml>' +
         '<block type="' + blockType + '" gap="' + gap + '">' +
         Blockly.Variables.generateVariableFieldXml_(variable, fieldName) +

diff --git a/core/procedures.js b/core/procedures.js
@@ -238,7 +238,7 @@ Blockly.Procedures.flyoutCategory = function(workspace) {
     // </block>
     var block = goog.dom.createDom('block');
     block.setAttribute('type', 'procedures_call');
-    block.setAttribute('gap', 16);
+    block.setAttribute('gap', 12);
     block.appendChild(mutation);
     xmlList.push(block);
   }
@@ -251,7 +251,7 @@ Blockly.Procedures.flyoutCategory = function(workspace) {
   if (showReturn) {
     var returnBlock = goog.dom.createDom('block');
     returnBlock.setAttribute('type', Blockly.PROCEDURES_RETURN_BLOCK_TYPE);
-    returnBlock.setAttribute('gap', 16);
+    returnBlock.setAttribute('gap', 12);
     var returnBlockValue = goog.dom.createDom('value');
     returnBlockValue.setAttribute('name', 'VALUE');
     var returnBlockShadow = goog.dom.createDom('shadow');