openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Custom graphics: cancel handles ALL

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-06-22 16:57:10 -05:00
parent 47ae32aaa9
commit 1f49703905
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/scenedit/scen.core.cpp
View File

@@ -3719,8 +3719,7 @@ extern fs::path tempDir;
extern std::string scenario_temp_dir_name; extern std::string scenario_temp_dir_name;
void edit_custom_sheets() { void edit_custom_sheets() {
// Creating and deleting graphics sheets happens immediately. Replacing graphics sheets, all actions // Everything you do in this dialog can be undone when you hit cancel, leaving no trace in the main history.
// are committed when you hit okay.
std::vector<action_ptr> deferred_actions; std::vector<action_ptr> deferred_actions;
int max_pic = -1; int max_pic = -1;
@@ -3768,7 +3767,7 @@ void edit_custom_sheets() {
ResMgr::graphics.pushPath(pic_dir); ResMgr::graphics.pushPath(pic_dir);
// We'll update the edit menu after this dialog closes // We'll update the edit menu after this dialog closes
undo_list.add(action_ptr(new aCreateGraphicsSheet(0))); deferred_actions.push_back(action_ptr(new aCreateGraphicsSheet(0)));
} }
set_cursor(watch_curs); set_cursor(watch_curs);
@@ -3779,7 +3778,6 @@ void edit_custom_sheets() {
for(size_t i = 0; i < spec_scen_g.numSheets; i++) { for(size_t i = 0; i < spec_scen_g.numSheets; i++) {
sheets[i] = spec_scen_g.sheets[i]->copyToImage(); sheets[i] = spec_scen_g.sheets[i]->copyToImage();
} }
auto sheetsSave = sheets;
using namespace std::placeholders; using namespace std::placeholders;
@@ -3865,7 +3863,7 @@ void edit_custom_sheets() {
sheets[cur].saveToFile(fpath.string().c_str()); sheets[cur].saveToFile(fpath.string().c_str());
return true; return true;
}); });
pic_dlg["new"].attachClickHandler([&sheets,&cur,&all_pics,&pic_dir](cDialog& me, std::string, eKeyMod) -> bool { pic_dlg["new"].attachClickHandler([&sheets,&cur,&all_pics,&pic_dir,&deferred_actions](cDialog& me, std::string, eKeyMod) -> bool {
cChoiceDlog pickNum("add-new-sheet", {"cancel", "new"}, &me); cChoiceDlog pickNum("add-new-sheet", {"cancel", "new"}, &me);
pickNum->getControl("num").setTextToNum(spec_scen_g.numSheets); pickNum->getControl("num").setTextToNum(spec_scen_g.numSheets);
if(pickNum.show() == "cancel") return true; if(pickNum.show() == "cancel") return true;
@@ -3895,11 +3893,10 @@ void edit_custom_sheets() {
set_dlg_custom_sheet(me, all_pics[cur]); set_dlg_custom_sheet(me, all_pics[cur]);
// We'll update the edit menu after this dialog closes deferred_actions.push_back(action_ptr(new aCreateGraphicsSheet(newSheet)));
undo_list.add(action_ptr(new aCreateGraphicsSheet(newSheet)));
return true; return true;
}); });
pic_dlg["del"].attachClickHandler([&sheets,&cur,&all_pics,&pic_dir](cDialog& me, std::string, eKeyMod) -> bool { pic_dlg["del"].attachClickHandler([&sheets,&cur,&all_pics,&pic_dir,&deferred_actions](cDialog& me, std::string, eKeyMod) -> bool {
int which_pic = all_pics[cur]; int which_pic = all_pics[cur];
fs::path fpath = pic_dir/("sheet" + std::to_string(which_pic) + ".png"); fs::path fpath = pic_dir/("sheet" + std::to_string(which_pic) + ".png");
@@ -3942,8 +3939,7 @@ void edit_custom_sheets() {
} }
if(fs::exists(fpath)) fs::remove(fpath); if(fs::exists(fpath)) fs::remove(fpath);
// We'll update the edit menu after this dialog closes deferred_actions.push_back(action_ptr(new aDeleteGraphicsSheet(which_pic, moved, image_for_undo)));
undo_list.add(action_ptr(new aDeleteGraphicsSheet(which_pic, moved, image_for_undo)));
if(all_pics.size() == 1) { if(all_pics.size() == 1) {
me["left"].hide(); me["left"].hide();
@@ -3980,16 +3976,18 @@ void edit_custom_sheets() {
shut_down_menus(5); // So that cmd+O, cmd+N, cmd+S can work shut_down_menus(5); // So that cmd+O, cmd+N, cmd+S can work
pic_dlg.run(); pic_dlg.run();
// Commit undo actions for the cancelable operations // Commit undo actions for everything that was done
if(pic_dlg.accepted()){ if(pic_dlg.accepted()){
for(action_ptr action : deferred_actions){ for(action_ptr action : deferred_actions){
undo_list.add(action); undo_list.add(action);
} }
} }
// Now, we need to restore the sheets if they pressed cancel // On cancel, UWIND the stack of deferred actions, reversing creations and deletions too.
else{ else{
for(auto p : sheetsSave) { while(!deferred_actions.empty()){
spec_scen_g.replace_sheet(p.first, p.second); action_ptr previous = deferred_actions.back();
deferred_actions.pop_back();
previous->undo();
} }
} }

2
src/scenedit/scen.undo.cpp
View File

@@ -779,7 +779,7 @@ bool aDeleteGraphicsSheet::undo_me() {
} }
image.saveToFile(sheetPath.string().c_str()); image.saveToFile(sheetPath.string().c_str());
if(index <= spec_scen_g.numSheets) spec_scen_g.numSheets++; if(index <= spec_scen_g.numSheets + 1) spec_scen_g.numSheets++;
return true; return true;
} }