Skip to content

fix: preserve toolbox scroll position when switching between sprites/the stage #10

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

Merged
gonfunko merged 1 commit into from
May 1, 2024
Merged

fix: preserve toolbox scroll position when switching between sprites/the stage #10

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/containers/blocks.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,13 @@ class Blocks extends React.Component {
updateToolbox () {
this.toolboxUpdateTimeout = false;

// const categoryId = this.workspace.toolbox_.getSelectedItem().getId();
// const offset = this.workspace.toolbox_.getCategoryScrollOffset();
const scale = this.workspace.getFlyout().getWorkspace().scale;
const selectedCategoryName = this.workspace.getToolbox().getSelectedItem().getName();
const selectedCategoryScrollPosition = this.workspace.getFlyout().getCategoryScrollPosition(
selectedCategoryName).y * scale;
const offsetWithinCategory = (this.workspace.getFlyout().getWorkspace().getMetrics().viewTop
- selectedCategoryScrollPosition);

this.workspace.updateToolbox(this.props.toolboxXML);
this.workspace.refreshToolboxSelection();
this._renderedToolboxXML = this.props.toolboxXML;
Expand All @@ -250,13 +255,10 @@ class Blocks extends React.Component {
// Using the setter function will rerender the entire toolbox which we just rendered.
this.workspace.toolboxRefreshEnabled_ = true;

// const currentCategoryPos = this.workspace.toolbox_.getCategoryPositionById(categoryId);
// const currentCategoryLen = this.workspace.toolbox_.getCategoryLengthById(categoryId);
// if (offset < currentCategoryLen) {
// this.workspace.toolbox_.setFlyoutScrollPos(currentCategoryPos + offset);
// } else {
// this.workspace.toolbox_.setFlyoutScrollPos(currentCategoryPos);
// }
const newCategoryScrollPosition = this.workspace.getFlyout().getCategoryScrollPosition(
selectedCategoryName).y * scale;
this.workspace.getFlyout().getWorkspace().scrollbar.setY(
newCategoryScrollPosition + offsetWithinCategory);

const queue = this.toolboxUpdateQueue;
this.toolboxUpdateQueue = [];
Expand Down