Skip to content

Scale selections with project zoom #126

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
BaronAWC wants to merge 4 commits into
base: development
Choose a base branch
from
Open

Scale selections with project zoom #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
293d095
border width and selection tolerance scale with canvas zoom
BaronAWC May 12, 2026
be9d862
scale path cursor hovers with zoom and make them thicker by default
BaronAWC May 12, 2026
73c9025
scale selection ghost with zoom
BaronAWC May 12, 2026
f063ba5
scale selection box with zoom
BaronAWC May 14, 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
2 changes: 1 addition & 1 deletion engine/src/tools/Cursor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ Wick.Tools.Cursor = class extends Wick.Tool {
stroke: true,
curves: true,
segments: true,
tolerance: this.SELECTION_TOLERANCE,
tolerance: this.SELECTION_TOLERANCE / this.paper.view.zoom,
match: result => {
return !result.item.data.isBorder;
}
Expand Down
10 changes: 5 additions & 5 deletions engine/src/tools/PathCursor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ Wick.Tools.PathCursor = class extends Wick.Tool {
this.CURSOR_SEGMENT = 'cursors/segment.png';
this.CURSOR_CURVE = 'cursors/curve.png';
this.HOVER_PREVIEW_SEGMENT_STROKE_COLOR = 'rgba(100,150,255,1.0)';
this.HOVER_PREVIEW_SEGMENT_STROKE_WIDTH = 1.5;
this.HOVER_PREVIEW_SEGMENT_STROKE_WIDTH = 3;
this.HOVER_PREVIEW_SEGMENT_FILL_COLOR = '#ffffff';
this.HOVER_PREVIEW_SEGMENT_RADIUS = 5;
this.HOVER_PREVIEW_CURVE_STROKE_WIDTH = 2;
this.HOVER_PREVIEW_CURVE_STROKE_WIDTH = 3;
this.HOVER_PREVIEW_CURVE_STROKE_COLOR = this.HOVER_PREVIEW_SEGMENT_STROKE_COLOR;

this.hitResult = new this.paper.HitResult();
Expand Down Expand Up @@ -76,12 +76,12 @@ Wick.Tools.PathCursor = class extends Wick.Tool {
// Hovering over a segment, draw a circle where the segment is
this.hoverPreview = new this.paper.Path.Circle(this.hitResult.segment.point, this.HOVER_PREVIEW_SEGMENT_RADIUS/this.paper.view.zoom);
this.hoverPreview.strokeColor = this.HOVER_PREVIEW_SEGMENT_STROKE_COLOR;
this.hoverPreview.strokeWidth = this.HOVER_PREVIEW_SEGMENT_STROKE_WIDTH;
this.hoverPreview.strokeWidth = this.HOVER_PREVIEW_SEGMENT_STROKE_WIDTH / this.paper.view.zoom;
this.hoverPreview.fillColor = this.HOVER_PREVIEW_SEGMENT_FILL_COLOR;
} else if (this.hitResult.type === 'curve' && !this.hitResult.item.data.isSelectionBoxGUI) {
// Hovering over a curve, render a copy of the curve that can be bent
this.hoverPreview = new this.paper.Path();
this.hoverPreview.strokeWidth = this.HOVER_PREVIEW_CURVE_STROKE_WIDTH;
this.hoverPreview.strokeWidth = this.HOVER_PREVIEW_CURVE_STROKE_WIDTH / this.paper.view.zoom;
this.hoverPreview.strokeColor = this.HOVER_PREVIEW_CURVE_STROKE_COLOR;
this.hoverPreview.add(new this.paper.Point(this.hitResult.location.curve.point1));
this.hoverPreview.add(new this.paper.Point(this.hitResult.location.curve.point2));
Expand Down Expand Up @@ -261,7 +261,7 @@ Wick.Tools.PathCursor = class extends Wick.Tool {
curves: true,
segments: true,
handles: this.detailedEditing !== null,
tolerance: this.SELECTION_TOLERANCE,
tolerance: this.SELECTION_TOLERANCE / this.paper.view.zoom,
match: (result => {
return result.item !== this.hoverPreview
&& !result.item.data.isBorder;
Expand Down
2 changes: 1 addition & 1 deletion engine/src/view/paper-ext/Paper.SelectionBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ paper.SelectionBox = class {
this._box = new this.paper.Path.Rectangle({
from: this._start,
to: this._end,
strokeWidth: 1,
strokeWidth: 1 / this.paper.view.zoom,
strokeColor: 'black',
});
}
Expand Down
10 changes: 5 additions & 5 deletions engine/src/view/paper-ext/Paper.SelectionWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ class SelectionWidget {
name: 'border',
from: this.boundingBox.topLeft,
to: this.boundingBox.bottomRight,
strokeWidth: SelectionWidget.BOX_STROKE_WIDTH,
strokeWidth: SelectionWidget.BOX_STROKE_WIDTH / paper.view.zoom,
strokeColor: SelectionWidget.BOX_STROKE_COLOR,
insert: false,
});
Expand All @@ -563,7 +563,7 @@ class SelectionWidget {
var border = new paper.Path.Rectangle({
from: bounds.topLeft,
to: bounds.bottomRight,
strokeWidth: SelectionWidget.BOX_STROKE_WIDTH,
strokeWidth: SelectionWidget.BOX_STROKE_WIDTH / paper.view.zoom,
strokeColor: SelectionWidget.BOX_STROKE_COLOR,
});
//border.rotate(-this.boxRotation, this._center);
Expand Down Expand Up @@ -668,14 +668,14 @@ class SelectionWidget {
outline.remove();
outline.fillColor = 'rgba(0,0,0,0)';
outline.strokeColor = SelectionWidget.GHOST_STROKE_COLOR;
outline.strokeWidth = SelectionWidget.GHOST_STROKE_WIDTH * 2;
outline.strokeWidth = SelectionWidget.GHOST_STROKE_WIDTH * 2 / paper.view.zoom;
ghost.addChild(outline);

var outline2 = outline.clone();
outline2.remove();
outline2.fillColor = 'rgba(0,0,0,0)';
outline2.strokeColor = '#ffffff';
outline2.strokeWidth = SelectionWidget.GHOST_STROKE_WIDTH;
outline2.strokeWidth = SelectionWidget.GHOST_STROKE_WIDTH / paper.view.zoom;
ghost.addChild(outline2);
});

Expand All @@ -684,7 +684,7 @@ class SelectionWidget {
to: this.boundingBox.bottomRight,
fillColor: 'rgba(0,0,0,0)',
strokeColor: SelectionWidget.GHOST_STROKE_COLOR,
strokeWidth: SelectionWidget.GHOST_STROKE_WIDTH,
strokeWidth: SelectionWidget.GHOST_STROKE_WIDTH / paper.view.zoom,
applyMatrix: false,
});
boundsOutline.rotate(this.boxRotation, this._center);
Expand Down