From e530f209cd917008f0be43a21a8814993163a3cb Mon Sep 17 00:00:00 2001
From: Sam El-Husseini <sam.elhusseini@gmail.com>
Date: Wed, 8 Jan 2020 08:47:10 -0800
Subject: [PATCH] Fix bug in zelos tight nesting code. (#3565)

---
 core/renderers/zelos/drawer.js | 3 +--
 core/renderers/zelos/info.js   | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js
index 2effb059f..0daa3a8b2 100644
--- a/core/renderers/zelos/drawer.js
+++ b/core/renderers/zelos/drawer.js
@@ -104,8 +104,7 @@ Blockly.zelos.Drawer.prototype.drawRightSideRow_ = function(row) {
   if (row.precedesStatement || row.followsStatement) {
     var cornerHeight = this.constants_.INSIDE_CORNERS.rightHeight;
     var remainingHeight = row.height -
-        (row.precedesStatement ? cornerHeight : 0) -
-        (row.followsStatement ? cornerHeight : 0);
+        (row.precedesStatement ? cornerHeight : 0);
     this.outlinePath_ +=
         (row.followsStatement ?
             this.constants_.INSIDE_CORNERS.pathBottomRight : '') +
diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js
index 45e7403c6..3bcd48edf 100644
--- a/core/renderers/zelos/info.js
+++ b/core/renderers/zelos/info.js
@@ -505,12 +505,15 @@ Blockly.zelos.RenderInfo.prototype.finalizeVerticalAlignment_ = function() {
             elem.connectedBlock.getHeightWidth().height >=
                 MIN_VERTICAL_TIGHTNESTING_HEIGHT) {
           hasNonShadowConnectedBlocks = true;
+          hasSingleTextOrImageField = false;
           break;
         } else if (Blockly.blockRendering.Types.isField(elem) &&
             (elem.field instanceof Blockly.FieldLabel ||
             elem.field instanceof Blockly.FieldImage)) {
           hasSingleTextOrImageField =
               hasSingleTextOrImageField == null ? true : false;
+        } else if (!Blockly.blockRendering.Types.isSpacer(elem)) {
+          hasSingleTextOrImageField = false;
         }
       }
       // Reduce the previous and next spacer's height.