Skip to content

Fix dragging sprites #603

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

Open
nimeratus wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix dragging sprites #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d77cd10
fix: make updating the drag info synchronous
nimeratus Mar 9, 2026
4b59951
fix: sort `candidateIDs` into drawing order
nimeratus Mar 9, 2026
af6d3e2
fix: lint error
nimeratus Jun 5, 2026
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
46 changes: 23 additions & 23 deletions packages/scratch-gui/src/containers/stage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,13 @@ class Stage extends React.Component {
this.state = {
mouseDownTimeoutId: null,
mouseDownPosition: null,
isDragging: false,
dragOffset: null,
dragId: null,
colorInfo: null,
question: null
};
this.isDragging = false;
this.dragOffset = null;
this.dragId = null;

if (this.props.vm.renderer) {
this.renderer = this.props.vm.renderer;
this.canvas = this.renderer.canvas;
Expand Down Expand Up @@ -181,7 +182,7 @@ class Stage extends React.Component {
this.pickY = mousePosition[1];
}

if (this.state.mouseDown && !this.state.isDragging) {
if (this.state.mouseDown && !this.isDragging) {
const distanceFromMouseDown = Math.sqrt(
Math.pow(mousePosition[0] - this.state.mouseDownPosition[0], 2) +
Math.pow(mousePosition[1] - this.state.mouseDownPosition[1], 2)
Expand All @@ -191,16 +192,16 @@ class Stage extends React.Component {
this.onStartDrag(...this.state.mouseDownPosition);
}
}
if (this.state.mouseDown && this.state.isDragging) {
if (this.state.mouseDown && this.isDragging) {
// Editor drag style only updates the drag canvas, does full update at the end of drag
// Non-editor drag style just updates the sprite continuously.
if (this.props.useEditorDragStyle) {
this.positionDragCanvas(mousePosition[0], mousePosition[1]);
} else {
const spritePosition = this.getScratchCoords(mousePosition[0], mousePosition[1]);
this.props.vm.postSpriteInfo({
x: spritePosition[0] + this.state.dragOffset[0],
y: -(spritePosition[1] + this.state.dragOffset[1]),
x: spritePosition[0] + this.dragOffset[0],
y: -(spritePosition[1] + this.dragOffset[1]),
force: true
});
}
Expand All @@ -227,9 +228,9 @@ class Stage extends React.Component {
y: y - this.rect.top,
canvasWidth: this.rect.width,
canvasHeight: this.rect.height,
wasDragged: this.state.isDragging
wasDragged: this.isDragging
};
if (this.state.isDragging) {
if (this.isDragging) {
this.onStopDrag(mousePosition[0], mousePosition[1]);
}
this.props.vm.postIOData('mouse', data);
Expand Down Expand Up @@ -339,7 +340,7 @@ class Stage extends React.Component {
this.dragCanvas.style.transform = `translate(${mouseX}px, ${mouseY}px)`;
}
onStartDrag (x, y) {
if (this.state.dragId) return;
if (this.dragId) return;

// Targets with no attached drawable cannot be dragged.
let draggableTargets = this.props.vm.runtime.targets.filter(
Expand Down Expand Up @@ -371,11 +372,11 @@ class Stage extends React.Component {
const offsetY = -(target.y + scratchMouseY);

this.props.vm.startDrag(targetId);
this.setState({
isDragging: true,
dragId: targetId,
dragOffset: [offsetX, offsetY]
});

this.isDragging = true;
this.dragId = targetId;
this.dragOffset = [offsetX, offsetY];

if (this.props.useEditorDragStyle) {
// Extract the drawable art
const drawableData = this.renderer.extractDrawableScreenSpace(drawableId);
Expand All @@ -386,14 +387,13 @@ class Stage extends React.Component {
}
}
onStopDrag (mouseX, mouseY) {
const dragId = this.state.dragId;
const dragId = this.dragId;
const commonStopDragActions = () => {
this.props.vm.stopDrag(dragId);
this.setState({
isDragging: false,
dragOffset: null,
dragId: null
});

this.isDragging = false;
this.dragOffset = null;
this.dragId = null;
};
if (this.props.useEditorDragStyle) {
// Need to sequence these actions to prevent flickering.
Expand All @@ -402,8 +402,8 @@ class Stage extends React.Component {
if (mouseX > 0 && mouseX < this.rect.width &&
mouseY > 0 && mouseY < this.rect.height) {
const spritePosition = this.getScratchCoords(mouseX, mouseY);
spriteInfo.x = spritePosition[0] + this.state.dragOffset[0];
spriteInfo.y = -(spritePosition[1] + this.state.dragOffset[1]);
spriteInfo.x = spritePosition[0] + this.dragOffset[0];
spriteInfo.y = -(spritePosition[1] + this.dragOffset[1]);
spriteInfo.force = true;
}
this.props.vm.postSpriteInfo(spriteInfo);
Expand Down
5 changes: 5 additions & 0 deletions packages/scratch-render/src/RenderWebGL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,11 @@ class RenderWebGL extends EventEmitter {
return false;
}

if (candidateIDs) {
// sort candidate IDs into drawing order
const set = new Set(candidateIDs);
candidateIDs = this._drawList.filter(id => set.has(id));
}
candidateIDs = (candidateIDs || this._drawList).filter(id => {
const drawable = this._allDrawables[id];
// default pick list ignores visible and ghosted sprites.
Expand Down
Loading