From 8a689e60a4189e20117f2faba2807b6acaac4d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0toura=C4=8D?= <525032@mail.muni.cz>
Date: Sun, 19 May 2024 14:41:02 +0200
Subject: [PATCH] change component remove to delete key
---
src/edit/src/editor.cpp | 13 ++++++++-----
src/gui/src/ui.cpp | 1 -
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/edit/src/editor.cpp b/src/edit/src/editor.cpp
index 41c7970..60efe2b 100644
--- a/src/edit/src/editor.cpp
+++ b/src/edit/src/editor.cpp
@@ -699,16 +699,16 @@ void Editor::controlBuild()
convertComponentToConType();
bool lmb_released = mouse.just_released().contains("MouseLeft");
- bool shift_held = keyboard.down().contains("LeftShift");
+ bool delete_pressed = keyboard.just_pressed().contains("Delete");
- if (!lmb_released)
- return;
-
- if (lmb_released && shift_held && selection_previous_frame && hover_nearest_node == selection_previous_frame)
+ if (delete_pressed)
{
removeComponent();
return;
}
+
+ if (!lmb_released)
+ return;
if (!checkBuildValid())
return;
@@ -1958,6 +1958,9 @@ node_ptr Editor::createVoxelNode(connector_ptr connector)
void Editor::removeComponent()
{
auto selection = scene->getSelection();
+ if (!selection)
+ return;
+
if (isConnector(selection))
removeConnector();
else if (isVoxel(selection))
diff --git a/src/gui/src/ui.cpp b/src/gui/src/ui.cpp
index 8b475ed..3869d76 100644
--- a/src/gui/src/ui.cpp
+++ b/src/gui/src/ui.cpp
@@ -402,7 +402,6 @@ void mode_II_build_selection_ui(const osi::Window &window, edit::UIData &data)
void build_toolbar_ui(const osi::Window &window, edit::UIData &data)
{
- // auto window_pos_x =window.size().x * 0.5f - build_toolbar_width * 0.5f;
if (data.allowed_components.empty())
return;
--
GitLab