From 4f6b3470da09171213f6d6ebb0557d31e09b3456 Mon Sep 17 00:00:00 2001
From: Maximilian Giller <m.giller@tu-bs.de>
Date: Thu, 6 Jan 2022 14:48:34 +0100
Subject: [PATCH] box-delete only active when delete tool is active
---
editor/js/tools/deletetool.js | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/editor/js/tools/deletetool.js b/editor/js/tools/deletetool.js
index 973a056..de14a76 100644
--- a/editor/js/tools/deletetool.js
+++ b/editor/js/tools/deletetool.js
@@ -12,12 +12,21 @@ export default class DeleteTool extends Tool {
constructor(key) {
super("Delete", "delete", key, new ToolMenu());
this.setupBoxSelect();
+ this.isActive = false;
if (deleteToolInstance === undefined) {
deleteToolInstance = this;
}
}
+ onToolActivate() {
+ this.isActive = true;
+ }
+
+ onToolDeactivate(nextTool) {
+ this.isActive = false;
+ }
+
onBoxSelect(left, bottom, top, right) {
// Filter out selected nodes
const hitNodes = [];
@@ -79,6 +88,11 @@ export default class DeleteTool extends Tool {
}
boxSelectOnPointerDown(e) {
+ // Only do anything if delete tool is also active
+ if (deleteToolInstance === undefined || deleteToolInstance.isActive == false) {
+ return;
+ }
+
if (!e.shiftKey) {
return;
}
--
GitLab