From 8b382830ccc024173ed595f04c696087014b2a00 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Tue, 17 Nov 2026 08:09:38 +0100 Subject: [PATCH] Fix objects being marked as modified when colliding object was renamed --- src/editor/dialogs/objectpropertiesdialog.cpp | 39 +++++++++++++++++++ src/editor/dialogs/objectpropertiesdialog.h | 1 + src/editor/dialogs/roompropertiesdialog.cpp | 2 + 3 files changed, 42 insertions(+) diff --git a/src/editor/dialogs/objectpropertiesdialog.cpp b/src/editor/dialogs/objectpropertiesdialog.cpp index e294b2f..2762ab4 100644 --- a/src/editor/dialogs/objectpropertiesdialog.cpp +++ b/src/editor/dialogs/objectpropertiesdialog.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include @@ -291,6 +292,8 @@ void ObjectPropertiesDialog::duplicateEvent() void ObjectPropertiesDialog::changed() { + if (m_updatingExternalReferences) return; + if (!m_unsavedChanges) { m_unsavedChanges = true; @@ -301,6 +304,8 @@ void ObjectPropertiesDialog::changed() void ObjectPropertiesDialog::objectNameChanged(const Object &object, const QString &oldName) { + QScopedValueRollback updatingReferences{m_updatingExternalReferences, true}; + const auto renameTargets = [&object, &oldName](ActionsContainer &actions) { for (Action &action : actions) std::visit([&](auto &value) { @@ -313,8 +318,39 @@ void ObjectPropertiesDialog::objectNameChanged(const Object &object, const QStri for (auto &[event, actions] : m_collisionEvents) renameTargets(actions); if (m_collisionEvents.contains(oldName)) { + auto *selection = m_ui->listViewEvents->selectionModel(); + auto selectedEvent = selection->currentIndex().isValid() + ? m_eventsModel->getEvent(selection->currentIndex()) + : ObjectEventsModel::get_event_result_t{}; + auto selectedType = selectedEvent + ? std::optional{selectedEvent->first} + : std::optional>{}; + if (selectedType) + if (auto *target = std::get_if(&*selectedType); + target && *target == oldName) + *target = object.name; + m_ui->actionsWidget->setActionsContainer(nullptr); m_eventsModel->changeEvent(oldName, object.name); + + QModelIndex restoredIndex; + if (selectedType) + for (int row = 0; row < m_eventsModel->rowCount({}); ++row) + if (const auto event = m_eventsModel->getEvent(row); + event && event->first == *selectedType) + { + restoredIndex = m_eventsModel->index(row, 0); + break; + } + + if (restoredIndex.isValid()) + selection->setCurrentIndex(restoredIndex, QItemSelectionModel::ClearAndSelect); + else + { + selection->clearSelection(); + selection->clearCurrentIndex(); + } + currentEventChanged(restoredIndex); } if (&object == &m_object) @@ -356,6 +392,8 @@ void ObjectPropertiesDialog::spriteNameChanged(const Sprite &sprite, const QStri void ObjectPropertiesDialog::objectAboutToBeRemoved(const Object &object) { + QScopedValueRollback updatingReferences{m_updatingExternalReferences, true}; + if (QSignalBlocker blocker{m_ui->widgetParent}; !m_ui->widgetParent->objectName().isEmpty() && m_ui->widgetParent->objectName() == object.name) m_ui->widgetParent->clearObject(); @@ -443,6 +481,7 @@ void ObjectPropertiesDialog::eventsContextMenuRequested(const QPoint &pos) void ObjectPropertiesDialog::rowsInserted(const QModelIndex &parent, int first) { + if (m_updatingExternalReferences) return; m_ui->listViewEvents->setCurrentIndex(m_eventsModel->index(first, 0, parent)); } diff --git a/src/editor/dialogs/objectpropertiesdialog.h b/src/editor/dialogs/objectpropertiesdialog.h index 405fc1c..65d6a26 100644 --- a/src/editor/dialogs/objectpropertiesdialog.h +++ b/src/editor/dialogs/objectpropertiesdialog.h @@ -81,4 +81,5 @@ private: QString m_maskSpriteName; bool m_unsavedChanges{}; + bool m_updatingExternalReferences{}; }; diff --git a/src/editor/dialogs/roompropertiesdialog.cpp b/src/editor/dialogs/roompropertiesdialog.cpp index 6d74fa2..ce55251 100644 --- a/src/editor/dialogs/roompropertiesdialog.cpp +++ b/src/editor/dialogs/roompropertiesdialog.cpp @@ -378,6 +378,8 @@ void RoomPropertiesDialog::objectNameChanged(const Object &object, const QString obj.objectName = object.name; } + + m_ui->roomEditWidget->update(); } void RoomPropertiesDialog::objectAboutToBeRemoved(const Object &object)