Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ScrollViewer: Fix moving / disappearing controls when freezing/unfreezing #7756

Merged
merged 1 commit into from Mar 4, 2020
Merged

ScrollViewer: Fix moving / disappearing controls when freezing/unfreezing #7756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/preview release/what's new.md
View file
Open in desktop
Expand Up @@ -34,6 +34,6 @@
- Fix infinite loop in `GlowLayer.unReferenceMeshFromUsingItsOwnMaterial` ([Popov72](https://github.com/Popov72)
- `QuadraticErrorSimplification` was not exported ([RaananW](https://github.com/Raananw)
- Fix NME Frames bug where collapsing and moving a frame removed the nodes inside ([Kyle Belfort](https://github.com/belfortk)

- Fix moving / disappearing controls when freezing/unfreezing the ScrollViewer ([Popov72](https://github.com/Popov72)

## Breaking changes
45 changes: 35 additions & 10 deletions gui/src/2D/controls/scrollViewers/scrollViewerWindow.ts
View file
Open in desktop
Expand Up @@ -13,8 +13,8 @@ export class _ScrollViewerWindow extends Container {

private _freezeControls = false;
private _parentMeasure: Measure;
private _oldLeft: number;
private _oldTop: number;
private _oldLeft: number | null;
private _oldTop: number | null;

public get freezeControls(): boolean {
return this._freezeControls;
Expand All @@ -25,6 +25,10 @@ export class _ScrollViewerWindow extends Container {
return;
}

if (!value) {
this._restoreMeasures();
}

// trigger a full normal layout calculation to be sure all children have their measures up to date
this._freezeControls = false;

Expand Down Expand Up @@ -87,16 +91,18 @@ export class _ScrollViewerWindow extends Container {
this._buckets = {};
this._bucketLen = Math.ceil(this.widthInPixels / this._bucketWidth);
this._dispatchInBuckets(this._children);
this._oldLeft = null;
this._oldTop = null;
}

private _dispatchInBuckets(children: Control[]): void {
for (let i = 0; i < children.length; ++i) {
let child = children[i];

let bStartX = Math.max(0, Math.floor((child._currentMeasure.left - this._currentMeasure.left) / this._bucketWidth)),
bEndX = Math.floor((child._currentMeasure.left - this._currentMeasure.left + child._currentMeasure.width - 1) / this._bucketWidth),
bStartY = Math.max(0, Math.floor((child._currentMeasure.top - this._currentMeasure.top) / this._bucketHeight)),
bEndY = Math.floor((child._currentMeasure.top - this._currentMeasure.top + child._currentMeasure.height - 1) / this._bucketHeight);
let bStartX = Math.max(0, Math.floor((child._customData._origLeft - this._customData.origLeft) / this._bucketWidth)),
bEndX = Math.floor((child._customData._origLeft - this._customData.origLeft + child._currentMeasure.width - 1) / this._bucketWidth),
bStartY = Math.max(0, Math.floor((child._customData._origTop - this._customData.origTop) / this._bucketHeight)),
bEndY = Math.floor((child._customData._origTop - this._customData.origTop + child._currentMeasure.height - 1) / this._bucketHeight);

while (bStartY <= bEndY) {
for (let x = bStartX; x <= bEndX; ++x) {
Expand Down Expand Up @@ -129,6 +135,11 @@ export class _ScrollViewerWindow extends Container {
this._currentMeasure.left -= left;
this._currentMeasure.top -= top;

this._customData.origLeftForChildren = this._measureForChildren.left;
this._customData.origTopForChildren = this._measureForChildren.top;
this._customData.origLeft = this._currentMeasure.left;
this._customData.origTop = this._currentMeasure.top;

this._updateChildrenMeasures(this._children, left, top);
}

Expand All @@ -148,6 +159,16 @@ export class _ScrollViewerWindow extends Container {
}
}

private _restoreMeasures(): void {
let left = this.leftInPixels | 0,
top = this.topInPixels | 0;

this._measureForChildren.left = this._customData.origLeftForChildren + left;
this._measureForChildren.top = this._customData.origTopForChildren + top;
this._currentMeasure.left = this._customData.origLeft + left;
this._currentMeasure.top = this._customData.origTop + top;
}

/**
* Creates a new ScrollViewerWindow
* @param name of ScrollViewerWindow
Expand Down Expand Up @@ -234,12 +255,16 @@ export class _ScrollViewerWindow extends Container {
this._clipForChildren(context);
}

let left = this.leftInPixels,
top = this.topInPixels;
let left = this.leftInPixels | 0,
top = this.topInPixels | 0;

if (this._useBuckets()) {
this._scrollChildrenWithBuckets(this._oldLeft, this._oldTop, left, top);
this._scrollChildrenWithBuckets(left, top, left, top);
if (this._oldLeft !== null && this._oldTop !== null) {
this._scrollChildrenWithBuckets(this._oldLeft, this._oldTop, left, top);
this._scrollChildrenWithBuckets(left, top, left, top);
} else {
this._scrollChildren(this._children, left, top);
}
} else {
this._scrollChildren(this._children, left, top);
}
Expand Down