diff --git a/core/field_colour.ts b/core/field_colour.ts index 1b022b64c..de771c9af 100644 --- a/core/field_colour.ts +++ b/core/field_colour.ts @@ -262,28 +262,20 @@ export class FieldColour extends Field { */ protected updateSize_(margin?: number) { const constants = this.getConstants(); - const xOffset = - margin !== undefined - ? margin - : !this.isFullBlockField() - ? constants!.FIELD_BORDER_RECT_X_PADDING - : 0; - let totalWidth = xOffset * 2; - let contentWidth = 0; - if (!this.isFullBlockField()) { - contentWidth = constants!.FIELD_COLOUR_DEFAULT_WIDTH; - totalWidth += contentWidth; - } - - let totalHeight = constants!.FIELD_TEXT_HEIGHT; - if (!this.isFullBlockField()) { - totalHeight = Math.max(totalHeight, constants!.FIELD_BORDER_RECT_HEIGHT); + let totalWidth; + let totalHeight; + if (this.isFullBlockField()) { + const xOffset = margin ?? 0; + totalWidth = xOffset * 2; + totalHeight = constants!.FIELD_TEXT_HEIGHT; + } else { + totalWidth = constants!.FIELD_COLOUR_DEFAULT_WIDTH; + totalHeight = constants!.FIELD_COLOUR_DEFAULT_HEIGHT; } this.size_.height = totalHeight; this.size_.width = totalWidth; - this.positionTextElement_(xOffset, contentWidth); this.positionBorderRect_(); } diff --git a/core/renderers/zelos/constants.ts b/core/renderers/zelos/constants.ts index e13a57e52..73a600c58 100644 --- a/core/renderers/zelos/constants.ts +++ b/core/renderers/zelos/constants.ts @@ -217,9 +217,9 @@ export class ConstantProvider extends BaseConstantProvider { this.FIELD_DROPDOWN_SVG_ARROW_PADDING = this.FIELD_BORDER_RECT_X_PADDING; - this.FIELD_COLOUR_DEFAULT_WIDTH = 2 * this.GRID_UNIT; + this.FIELD_COLOUR_DEFAULT_WIDTH = 6 * this.GRID_UNIT; - this.FIELD_COLOUR_DEFAULT_HEIGHT = 4 * this.GRID_UNIT; + this.FIELD_COLOUR_DEFAULT_HEIGHT = 8 * this.GRID_UNIT; this.FIELD_CHECKBOX_X_OFFSET = 1 * this.GRID_UNIT;