From 71e720444fd0c305508ab8b3b62246794a3bdf52 Mon Sep 17 00:00:00 2001 From: Rachel Fenichel Date: Mon, 12 Aug 2019 15:51:41 -0700 Subject: [PATCH] Use connection width to find empty input width --- .../block_rendering_rewrite/block_rendering_constants.js | 5 ++--- core/renderers/block_rendering_rewrite/measurables.js | 6 ++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/renderers/block_rendering_rewrite/block_rendering_constants.js b/core/renderers/block_rendering_rewrite/block_rendering_constants.js index e2901234e..f507f7cdf 100644 --- a/core/renderers/block_rendering_rewrite/block_rendering_constants.js +++ b/core/renderers/block_rendering_rewrite/block_rendering_constants.js @@ -108,13 +108,12 @@ Blockly.blockRendering.constants.SPACER_DEFAULT_HEIGHT = 15; Blockly.blockRendering.constants.MIN_BLOCK_HEIGHT = 24; -Blockly.blockRendering.constants.EMPTY_INLINE_INPUT_WIDTH = - Blockly.blockRendering.constants.TAB_WIDTH + 14.5; +Blockly.blockRendering.constants.EMPTY_INLINE_INPUT_PADDING = 14.5; Blockly.blockRendering.constants.EMPTY_INLINE_INPUT_HEIGHT = Blockly.blockRendering.constants.TAB_HEIGHT + 11; -Blockly.blockRendering.constants.EXTERNAL_VALUE_INPUT_WIDTH = 10; +Blockly.blockRendering.constants.EXTERNAL_VALUE_INPUT_PADDING = 2; /** * The height of an empty statement input. Note that in the old rendering this diff --git a/core/renderers/block_rendering_rewrite/measurables.js b/core/renderers/block_rendering_rewrite/measurables.js index 128a41583..de88510b5 100644 --- a/core/renderers/block_rendering_rewrite/measurables.js +++ b/core/renderers/block_rendering_rewrite/measurables.js @@ -255,7 +255,8 @@ Blockly.blockRendering.InlineInput = function(input) { if (!this.connectedBlock) { this.height = Blockly.blockRendering.constants.EMPTY_INLINE_INPUT_HEIGHT; - this.width = Blockly.blockRendering.constants.EMPTY_INLINE_INPUT_WIDTH; + this.width = this.connectionShape.width + + Blockly.blockRendering.constants.EMPTY_INLINE_INPUT_PADDING; } else { // We allow the dark path to show on the parent block so that the child // block looks embossed. This takes up an extra pixel in both x and y. @@ -315,7 +316,8 @@ Blockly.blockRendering.ExternalValueInput = function(input) { this.height = this.connectedBlockHeight - 2 * Blockly.blockRendering.constants.TAB_OFFSET_FROM_TOP; } - this.width = Blockly.blockRendering.constants.EXTERNAL_VALUE_INPUT_WIDTH; + this.width = this.connectionShape.width + + Blockly.blockRendering.constants.EXTERNAL_VALUE_INPUT_PADDING; this.connectionOffsetY = Blockly.blockRendering.constants.TAB_OFFSET_FROM_TOP; this.connectionHeight = this.connectionShape.height;