etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-27 15:03:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: undo, part 2

Browse source
This commit is contained in:
tildearrow 2021-12-26 18:28:06 -05:00
parent 114ee9a7e4
commit cea595bfb8
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/gui/gui.cpp
View file

@ -1976,7 +1976,6 @@ void FurnaceGUI::doUndo() {
case GUI_ACTION_PATTERN_PASTE: case GUI_ACTION_PATTERN_PASTE:
for (UndoPatternData& i: us.pat) { for (UndoPatternData& i: us.pat) {
DivPattern* p=e->song.pat[i.chan].getPattern(i.pat,true); DivPattern* p=e->song.pat[i.chan].getPattern(i.pat,true);
printf("setting %d %d to %d\n",i.row,i.col,i.oldVal);
p->data[i.row][i.col]=i.oldVal; p->data[i.row][i.col]=i.oldVal;
} }
if (!e->isPlaying()) { if (!e->isPlaying()) {
@ -1995,7 +1994,44 @@ void FurnaceGUI::doUndo() {
} }
void FurnaceGUI::doRedo() { void FurnaceGUI::doRedo() {
if (redoHist.empty()) return;
UndoStep& us=redoHist.back();
undoHist.push_back(us);
switch (us.type) {
case GUI_ACTION_CHANGE_SYSTEM:
e->changeSystem(us.newSystem);
updateWindowTitle();
break;
case GUI_ACTION_CHANGE_ORDER:
e->song.ordersLen=us.newOrdersLen;
for (UndoOrderData& i: us.ord) {
e->song.orders.ord[i.chan][i.ord]=i.newVal;
}
break;
case GUI_ACTION_PATTERN_EDIT:
case GUI_ACTION_PATTERN_DELETE:
case GUI_ACTION_PATTERN_PULL:
case GUI_ACTION_PATTERN_PUSH:
case GUI_ACTION_PATTERN_CUT:
case GUI_ACTION_PATTERN_PASTE:
for (UndoPatternData& i: us.pat) {
DivPattern* p=e->song.pat[i.chan].getPattern(i.pat,true);
p->data[i.row][i.col]=i.newVal;
}
if (!e->isPlaying()) {
cursor=us.cursor;
selStart=us.selStart;
selEnd=us.selEnd;
curNibble=us.nibble;
updateScroll(cursor.y);
e->setOrder(us.order);
}
break;
}
redoHist.pop_back();
} }
void FurnaceGUI::keyDown(SDL_Event& ev) { void FurnaceGUI::keyDown(SDL_Event& ev) {
@ -2094,9 +2130,9 @@ void FurnaceGUI::keyDown(SDL_Event& ev) {
} }
pat->data[cursor.y][2]=curIns; pat->data[cursor.y][2]=curIns;
} }
makeUndo(GUI_ACTION_PATTERN_EDIT);
editAdvance(); editAdvance();
curNibble=false; curNibble=false;
makeUndo(GUI_ACTION_PATTERN_EDIT);
} catch (std::out_of_range& e) { } catch (std::out_of_range& e) {
} }
} else { // value } else { // value
@ -2110,6 +2146,7 @@ void FurnaceGUI::keyDown(SDL_Event& ev) {
if (pat->data[cursor.y][cursor.xFine+1]>=(int)e->song.ins.size()) { if (pat->data[cursor.y][cursor.xFine+1]>=(int)e->song.ins.size()) {
pat->data[cursor.y][cursor.xFine+1]=(int)e->song.ins.size()-1; pat->data[cursor.y][cursor.xFine+1]=(int)e->song.ins.size()-1;
} }
makeUndo(GUI_ACTION_PATTERN_EDIT);
if (e->song.ins.size()<16) { if (e->song.ins.size()<16) {
curNibble=false; curNibble=false;
editAdvance(); editAdvance();
@ -2119,6 +2156,7 @@ void FurnaceGUI::keyDown(SDL_Event& ev) {
} }
} else if (cursor.xFine==2) { // volume } else if (cursor.xFine==2) { // volume
pat->data[cursor.y][cursor.xFine+1]&=e->getMaxVolumeChan(cursor.xCoarse); pat->data[cursor.y][cursor.xFine+1]&=e->getMaxVolumeChan(cursor.xCoarse);
makeUndo(GUI_ACTION_PATTERN_EDIT);
if (e->getMaxVolumeChan(cursor.xCoarse)<16) { if (e->getMaxVolumeChan(cursor.xCoarse)<16) {
curNibble=false; curNibble=false;
editAdvance(); editAdvance();
@ -2127,10 +2165,10 @@ void FurnaceGUI::keyDown(SDL_Event& ev) {
if (!curNibble) editAdvance(); if (!curNibble) editAdvance();
} }
} else { } else {
makeUndo(GUI_ACTION_PATTERN_EDIT);
curNibble=!curNibble; curNibble=!curNibble;
if (!curNibble) editAdvance(); if (!curNibble) editAdvance();
} }
makeUndo(GUI_ACTION_PATTERN_EDIT);
} catch (std::out_of_range& e) { } catch (std::out_of_range& e) {
} }
} }

2
src/gui/gui.h
View file

@ -95,7 +95,7 @@ struct UndoPatternData {
chan(c), chan(c),
pat(p), pat(p),
row(r), row(r),
col(c), col(co),
oldVal(v1), oldVal(v1),
newVal(v2) {} newVal(v2) {}
}; };