Skip to content

3D: Fix editor undo/redo keybinds and hotkey signal bugs #1252

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
tanish2k09 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

3D: Fix editor undo/redo keybinds and hotkey signal bugs #1252

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 36 additions & 8 deletions frontend/apps/artcraft/app/src/pages/PageEnigma/Editor/keybinds_controls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,25 +375,53 @@ export class MouseControls {

if ((event.ctrlKey || event.metaKey) && !this.isProcessing) {
const keyLower = event.key.toLowerCase();
if (keyLower === "z") {
// redo
if (keyLower === "z" && !event.shiftKey) {
// undo
event.preventDefault();
this.isProcessing = true;
try {
await this.sceneManager?.undo();
} finally {
this.isProcessing = false;
}
} else if (keyLower === "z" && event.shiftKey) {
// redo (Ctrl+Shift+Z / Cmd+Shift+Z)
event.preventDefault();
this.isProcessing = true;
try {
await this.sceneManager?.redo();
} finally {
this.isProcessing = false;
}
} else if (keyLower === "y" && !event.metaKey) {
// redo (Ctrl+Y, Windows/Linux)
event.preventDefault();
this.isProcessing = true;
await this.sceneManager?.redo();
this.isProcessing = false;
try {
await this.sceneManager?.redo();
} finally {
this.isProcessing = false;
}
} else if (keyLower === "c") {
// Copy
event.preventDefault();
event.stopPropagation();
this.isProcessing = true;
await this.sceneManager?.copy();
this.isProcessing = false;
try {
await this.sceneManager?.copy();
} finally {
this.isProcessing = false;
}
} else if (keyLower === "v") {
// Paste
event.preventDefault();
event.stopPropagation();
this.isProcessing = true;
await this.sceneManager?.paste();
this.isProcessing = false;
try {
await this.sceneManager?.paste();
} finally {
this.isProcessing = false;
}
} else if (event.key === "0") {
// Stats Menu
this.enable_stats();
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/artcraft/app/src/pages/PageEnigma/signals/hotkeys.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const isHotkeyDisabled = ()=>{
export const disableHotkeyInput = (level: number)=>{
if(hotkeysStatus.value.disabled === true){
if (level > hotkeysStatus.value.disabledBy){
hotkeysStatus.value.disabledBy === level;
hotkeysStatus.value = { ...hotkeysStatus.value, disabledBy: level };
}
}else{
hotkeysStatus.value = {
Expand Down