maelstrom/openblocks
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases 3 Packages Wiki Activity Actions

fix(editor): group/ungroup-ing not creating history states

Browse source
This commit is contained in:
maelstrom 2025-07-08 00:31:45 +02:00
parent f80e9c4cc3
commit fc105400e3
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
editor/mainwindow.cpp
View file

@ -391,14 +391,16 @@ void MainWindow::connectActionHandlers() {
auto model = Model::New(); auto model = Model::New();
std::shared_ptr<Instance> firstParent; std::shared_ptr<Instance> firstParent;
bool done = false;
std::shared_ptr<Selection> selection = gDataModel->GetService<Selection>(); std::shared_ptr<Selection> selection = gDataModel->GetService<Selection>();
for (auto object : selection->Get()) { for (auto object : selection->Get()) {
if (firstParent == nullptr && object->GetParent().has_value()) firstParent = object->GetParent().value(); if (firstParent == nullptr && object->GetParent().has_value()) firstParent = object->GetParent().value();
historyState.push_back(UndoStateInstanceReparented { object, object->GetParent().value(), model }); historyState.push_back(UndoStateInstanceReparented { object, object->GetParent().value(), model });
object->SetParent(model); object->SetParent(model);
done = true;
} }
if (model->GetChildren().size() == 0) if (!done)
return; return;
// Technically not how it works in the actual studio, but it's not an API-breaking change // Technically not how it works in the actual studio, but it's not an API-breaking change
@ -408,6 +410,7 @@ void MainWindow::connectActionHandlers() {
model->SetParent(firstParent); model->SetParent(firstParent);
historyState.push_back(UndoStateSelectionChanged { selection->Get(), { model } }); historyState.push_back(UndoStateSelectionChanged { selection->Get(), { model } });
undoManager.PushState(historyState);
selection->Set({ model }); selection->Set({ model });
playSound("./assets/excluded/electronicpingshort.wav"); playSound("./assets/excluded/electronicpingshort.wav");
}); });
@ -416,10 +419,12 @@ void MainWindow::connectActionHandlers() {
UndoState historyState; UndoState historyState;
std::vector<std::shared_ptr<Instance>> newSelection; std::vector<std::shared_ptr<Instance>> newSelection;
bool done = false;
std::shared_ptr<Selection> selection = gDataModel->GetService<Selection>(); std::shared_ptr<Selection> selection = gDataModel->GetService<Selection>();
for (auto model : selection->Get()) { for (auto model : selection->Get()) {
// Not a model, skip // Not a model, skip
if (!model->IsA<Model>()) { newSelection.push_back(model); continue; } if (!model->IsA<Model>()) { newSelection.push_back(model); continue; }
done = true;
for (auto object : model->GetChildren()) { for (auto object : model->GetChildren()) {
historyState.push_back(UndoStateInstanceReparented { object, object->GetParent().value(), model->GetParent().value() }); historyState.push_back(UndoStateInstanceReparented { object, object->GetParent().value(), model->GetParent().value() });
@ -431,7 +436,11 @@ void MainWindow::connectActionHandlers() {
model->SetParent(std::nullopt); model->SetParent(std::nullopt);
} }
if (!done)
return;
historyState.push_back(UndoStateSelectionChanged { selection->Get(), newSelection }); historyState.push_back(UndoStateSelectionChanged { selection->Get(), newSelection });
undoManager.PushState(historyState);
selection->Set(newSelection); selection->Set(newSelection);
playSound("./assets/excluded/electronicpingshort.wav"); playSound("./assets/excluded/electronicpingshort.wav");
}); });