etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GUI: finish some TODOs

This commit is contained in:
tildearrow 2023-08-05 18:29:46 -05:00
parent aa39a041b5
commit 10615b9b5b
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/doAction.cpp
View File

@ -589,11 +589,23 @@ void FurnaceGUI::doAction(int what) {
case GUI_ACTION_PAT_EXPAND_SONG: case GUI_ACTION_PAT_EXPAND_SONG:
doExpandSong(collapseAmount); doExpandSong(collapseAmount);
break; break;
case GUI_ACTION_PAT_LATCH: // TODO case GUI_ACTION_PAT_LATCH: {
DivPattern* pat=e->curPat[cursor.xCoarse].getPattern(e->curOrders->ord[cursor.xCoarse][curOrder],true);
latchIns=pat->data[cursor.y][2];
latchVol=pat->data[cursor.y][3];
latchEffect=pat->data[cursor.y][4];
latchEffectVal=pat->data[cursor.y][5];
latchTarget=0;
latchNibble=false;
break; break;
case GUI_ACTION_PAT_SCROLL_MODE: // TODO }
break; case GUI_ACTION_PAT_CLEAR_LATCH:
case GUI_ACTION_PAT_CLEAR_LATCH: // TODO latchIns=-2;
latchVol=-1;
latchEffect=-1;
latchEffectVal=-1;
latchTarget=0;
latchNibble=false;
break; break;
case GUI_ACTION_INS_LIST_ADD: case GUI_ACTION_INS_LIST_ADD:

4
src/gui/editing.cpp
View File

@ -68,7 +68,7 @@ void FurnaceGUI::prepareUndo(ActionType action) {
} }
break; break;
case GUI_UNDO_PATTERN_COLLAPSE_SONG: case GUI_UNDO_PATTERN_COLLAPSE_SONG:
case GUI_UNDO_PATTERN_EXPAND_SONG: // TODO case GUI_UNDO_PATTERN_EXPAND_SONG: // this is handled by doCollapseSong/doExpandSong
break; break;
case GUI_UNDO_REPLACE: // this is handled by doReplace() case GUI_UNDO_REPLACE: // this is handled by doReplace()
break; break;
@ -134,7 +134,7 @@ void FurnaceGUI::makeUndo(ActionType action) {
} }
break; break;
case GUI_UNDO_PATTERN_COLLAPSE_SONG: case GUI_UNDO_PATTERN_COLLAPSE_SONG:
case GUI_UNDO_PATTERN_EXPAND_SONG: // TODO case GUI_UNDO_PATTERN_EXPAND_SONG: // this is handled by doCollapseSong/doExpandSong
break; break;
case GUI_UNDO_REPLACE: // this is handled by doReplace() case GUI_UNDO_REPLACE: // this is handled by doReplace()
break; break;

1
src/gui/fileDialog.cpp
View File

@ -28,7 +28,6 @@ struct NFDState {
} }
}; };
// TODO: filter
void _nfdThread(const NFDState state, std::atomic<bool>* ok, std::vector<String>* result, bool* errorOutput) { void _nfdThread(const NFDState state, std::atomic<bool>* ok, std::vector<String>* result, bool* errorOutput) {
nfdchar_t* out=NULL; nfdchar_t* out=NULL;
nfdresult_t ret=NFD_CANCEL; nfdresult_t ret=NFD_CANCEL;

1
src/gui/settings.cpp
View File

@ -1478,6 +1478,7 @@ void FurnaceGUI::drawSettings() {
UI_KEYBIND_CONFIG(GUI_ACTION_PAT_COLLAPSE_SONG); UI_KEYBIND_CONFIG(GUI_ACTION_PAT_COLLAPSE_SONG);
UI_KEYBIND_CONFIG(GUI_ACTION_PAT_EXPAND_SONG); UI_KEYBIND_CONFIG(GUI_ACTION_PAT_EXPAND_SONG);
UI_KEYBIND_CONFIG(GUI_ACTION_PAT_LATCH); UI_KEYBIND_CONFIG(GUI_ACTION_PAT_LATCH);
UI_KEYBIND_CONFIG(GUI_ACTION_PAT_CLEAR_LATCH);
KEYBIND_CONFIG_END; KEYBIND_CONFIG_END;
ImGui::TreePop(); ImGui::TreePop();