CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-07 17:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: color field sizing being incorrect (#7566)

Browse Source
This commit is contained in:
Beka Westberg
2023-10-02 13:16:03 -07:00
committed by GitHub
parent 6b023b3a32
commit 5151b28e7d
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/field_colour.ts
View File

@@ -262,28 +262,20 @@ export class FieldColour extends Field<string> {
*/
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_();
}

4
core/renderers/zelos/constants.ts
View File

@@ -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;