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.

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

feat: setting "snap to objects" #222

Merged
merged 1 commit into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions packages/core/src/setting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ export class Setting {
gridSnapX: 1,
gridSnapY: 1,

snapToObjects: true,

dragBlockStep: 4, // drag handler will not happen if move distance less this value

offsetX: 0, // mouse offset
Expand Down
5 changes: 3 additions & 2 deletions packages/core/src/tools/tool_draw_graphics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export abstract class DrawGraphicsTool implements ITool {
private unbindEvent: () => void = noop;

constructor(protected editor: SuikaEditor) {}

onActive() {
const editor = this.editor;
const hotkeysManager = editor.hostEventManager;
Expand All @@ -59,7 +60,7 @@ export abstract class DrawGraphicsTool implements ITool {
if (editor.hostEventManager.isDraggingCanvasBySpace) {
return;
}
if (this.isDragging) {
if (this.isDragging && this.editor.setting.get('snapToObjects')) {
this.editor.refLine.cacheGraphicsRefLines({
excludeItems: this.editor.selectedElements.getItems(),
});
Expand Down Expand Up @@ -142,7 +143,7 @@ export abstract class DrawGraphicsTool implements ITool {
this.editor.setting,
);

if (!this.isDragging) {
if (!this.isDragging && this.editor.setting.get('snapToObjects')) {
this.editor.refLine.cacheGraphicsRefLines();
}
const offset = this.editor.refLine.getGraphicsSnapOffset([
Expand Down
8 changes: 5 additions & 3 deletions packages/core/src/tools/tool_select/tool_select_move.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,11 @@ export class SelectMoveTool implements IBaseTool {
this.prevBBoxPos = { x: boundingRect.x, y: boundingRect.y };
}

this.editor.refLine.cacheGraphicsRefLines({
excludeItems: this.selectedItems,
});
if (this.editor.setting.get('snapToObjects')) {
this.editor.refLine.cacheGraphicsRefLines({
excludeItems: this.selectedItems,
});
}
}
onDrag(e: PointerEvent) {
this.dragPoint = this.editor.getCursorXY(e);
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/tools/tool_select/tool_select_resize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export class SelectResizeTool implements IBaseTool {
(this.editor.selectedElements.size() > 1 ||
this.editor.selectedElements.getItems()[0].getRotate() % HALF_PI === 0);

if (!this.lastDragPoint) {
if (!this.lastDragPoint && this.editor.setting.get('snapToObjects')) {
this.editor.refLine.cacheGraphicsRefLines({
excludeItems: this.editor.selectedElements.getItems(),
});
Expand Down
1 change: 1 addition & 0 deletions packages/suika/src/components/Editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const storeKeys: Partial<keyof SettingValue>[] = [
'invertZoomDirection',
'highlightLayersOnHover',
'flipObjectsWhileResizing',
'snapToObjects',
];

const Editor: FC = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ export const Menu: FC = () => {
key: 'preference',
label: t({ id: 'preference' }),
children: [
{
key: 'snapToObjects',
check: editorSetting.snapToObjects,
label: t({ id: 'snapToObjects' }),
},
{
key: 'keepToolSelectedAfterUse',
check: editorSetting.keepToolSelectedAfterUse,
Expand Down Expand Up @@ -87,6 +92,7 @@ export const Menu: FC = () => {
case 'invertZoomDirection':
case 'highlightLayersOnHover':
case 'flipObjectsWhileResizing':
case 'snapToObjects':
editor.setting.toggle(key);
preventClose = true;
break;
Expand Down
1 change: 1 addition & 0 deletions packages/suika/src/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"invertZoomDirection": "Invert zoom direction",
"highlightLayersOnHover": "Highlight layers on hover",
"flipObjectsWhileResizing": "Flip objects while resizing",
"snapToObjects": "Snap to objects",

"done": "Done",

Expand Down
1 change: 1 addition & 0 deletions packages/suika/src/locale/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"invertZoomDirection": "反转缩放方向",
"highlightLayersOnHover": "鼠标悬停时高亮图层",
"flipObjectsWhileResizing": "缩放时对图形进行翻转",
"snapToObjects": "吸附到对象",

"done": "完成",

Expand Down
Loading