GUI: make undo/redo key global
This commit is contained in:
parent
cea595bfb8
commit
fa6c9fb7b7
|
@ -1696,7 +1696,6 @@ void FurnaceGUI::makeUndo(ActionType action) {
|
||||||
for (int j=0; j<e->song.patLen; j++) {
|
for (int j=0; j<e->song.patLen; j++) {
|
||||||
for (int k=0; k<16; k++) {
|
for (int k=0; k<16; k++) {
|
||||||
if (p->data[j][k]!=oldPat[i]->data[j][k]) {
|
if (p->data[j][k]!=oldPat[i]->data[j][k]) {
|
||||||
printf("pushing chan %d order %d row %d col %d data %d new data %d\n",i,e->song.orders.ord[i][order],j,k,oldPat[i]->data[j][k],p->data[j][k]);
|
|
||||||
s.pat.push_back(UndoPatternData(i,e->song.orders.ord[i][order],j,k,oldPat[i]->data[j][k],p->data[j][k]));
|
s.pat.push_back(UndoPatternData(i,e->song.orders.ord[i][order],j,k,oldPat[i]->data[j][k],p->data[j][k]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2036,7 +2035,17 @@ void FurnaceGUI::doRedo() {
|
||||||
|
|
||||||
void FurnaceGUI::keyDown(SDL_Event& ev) {
|
void FurnaceGUI::keyDown(SDL_Event& ev) {
|
||||||
// GLOBAL KEYS
|
// GLOBAL KEYS
|
||||||
switch (ev.key.keysym.sym) {
|
if (ev.key.keysym.mod&KMOD_CTRL) {
|
||||||
|
switch (ev.key.keysym.sym) {
|
||||||
|
case SDLK_z:
|
||||||
|
if (ev.key.keysym.mod&KMOD_SHIFT) {
|
||||||
|
doRedo();
|
||||||
|
} else {
|
||||||
|
doUndo();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} else switch (ev.key.keysym.sym) {
|
||||||
case SDLK_F5:
|
case SDLK_F5:
|
||||||
if (!e->isPlaying()) e->play();
|
if (!e->isPlaying()) e->play();
|
||||||
break;
|
break;
|
||||||
|
@ -2062,13 +2071,6 @@ void FurnaceGUI::keyDown(SDL_Event& ev) {
|
||||||
case GUI_WINDOW_PATTERN: {
|
case GUI_WINDOW_PATTERN: {
|
||||||
if (ev.key.keysym.mod&KMOD_CTRL) {
|
if (ev.key.keysym.mod&KMOD_CTRL) {
|
||||||
switch (ev.key.keysym.sym) {
|
switch (ev.key.keysym.sym) {
|
||||||
case SDLK_z:
|
|
||||||
if (ev.key.keysym.mod&KMOD_SHIFT) {
|
|
||||||
doRedo();
|
|
||||||
} else {
|
|
||||||
doUndo();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SDLK_x:
|
case SDLK_x:
|
||||||
doCopy(true);
|
doCopy(true);
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue