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

refactor: use getters for flyout width and height. (#8564)

Browse Source
This commit is contained in:
Aaron Dodson
2024-09-03 13:25:18 -07:00
committed by GitHub
parent ba0762348d
commit cb1c055bff
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/flyout_horizontal.ts
View File

@@ -98,7 +98,7 @@ export class HorizontalFlyout extends Flyout {
if (atTop) {
y = toolboxMetrics.height;
} else {
y = viewMetrics.height - this.height_;
y = viewMetrics.height - this.getHeight();
}
} else {
if (atTop) {
@@ -116,7 +116,7 @@ export class HorizontalFlyout extends Flyout {
// to align the bottom edge of the flyout with the bottom edge of the
// blocklyDiv, we calculate the full height of the div minus the height
// of the flyout.
y = viewMetrics.height + absoluteMetrics.top - this.height_;
y = viewMetrics.height + absoluteMetrics.top - this.getHeight();
}
}
@@ -133,13 +133,13 @@ export class HorizontalFlyout extends Flyout {
this.width_ = targetWorkspaceViewMetrics.width;
const edgeWidth = targetWorkspaceViewMetrics.width - 2 * this.CORNER_RADIUS;
const edgeHeight = this.height_ - this.CORNER_RADIUS;
const edgeHeight = this.getHeight() - this.CORNER_RADIUS;
this.setBackgroundPath(edgeWidth, edgeHeight);
const x = this.getX();
const y = this.getY();
this.positionAt_(this.width_, this.height_, x, y);
this.positionAt_(this.getWidth(), this.getHeight(), x, y);
}
/**
@@ -380,7 +380,7 @@ export class HorizontalFlyout extends Flyout {
flyoutHeight *= this.workspace_.scale;
flyoutHeight += Scrollbar.scrollbarThickness;
if (this.height_ !== flyoutHeight) {
if (this.getHeight() !== flyoutHeight) {
for (let i = 0, block; (block = blocks[i]); i++) {
if (this.rectMap_.has(block)) {
this.moveRectToBlock_(this.rectMap_.get(block)!, block);

10
core/flyout_vertical.ts
View File

@@ -86,7 +86,7 @@ export class VerticalFlyout extends Flyout {
if (this.toolboxPosition_ === toolbox.Position.LEFT) {
x = toolboxMetrics.width;
} else {
x = viewMetrics.width - this.width_;
x = viewMetrics.width - this.getWidth();
}
} else {
if (this.toolboxPosition_ === toolbox.Position.LEFT) {
@@ -104,7 +104,7 @@ export class VerticalFlyout extends Flyout {
// to align the right edge of the flyout with the right edge of the
// blocklyDiv, we calculate the full width of the div minus the width
// of the flyout.
x = viewMetrics.width + absoluteMetrics.left - this.width_;
x = viewMetrics.width + absoluteMetrics.left - this.getWidth();
}
}
@@ -130,7 +130,7 @@ export class VerticalFlyout extends Flyout {
const targetWorkspaceViewMetrics = metricsManager.getViewMetrics();
this.height_ = targetWorkspaceViewMetrics.height;
const edgeWidth = this.width_ - this.CORNER_RADIUS;
const edgeWidth = this.getWidth() - this.CORNER_RADIUS;
const edgeHeight =
targetWorkspaceViewMetrics.height - 2 * this.CORNER_RADIUS;
this.setBackgroundPath(edgeWidth, edgeHeight);
@@ -138,7 +138,7 @@ export class VerticalFlyout extends Flyout {
const x = this.getX();
const y = this.getY();
this.positionAt_(this.width_, this.height_, x, y);
this.positionAt_(this.getWidth(), this.getHeight(), x, y);
}
/**
@@ -349,7 +349,7 @@ export class VerticalFlyout extends Flyout {
flyoutWidth *= this.workspace_.scale;
flyoutWidth += Scrollbar.scrollbarThickness;
if (this.width_ !== flyoutWidth) {
if (this.getWidth() !== flyoutWidth) {
for (let i = 0, block; (block = blocks[i]); i++) {
if (this.RTL) {
// With the flyoutWidth known, right-align the blocks.