otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

GUI: comfortable wave macro height

Browse source
This commit is contained in:
tildearrow 2022-09-17 22:55:58 -05:00
parent 3e311d94a2
commit 6bf6a854ef
4 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/doAction.cpp
View file

@ -645,6 +645,7 @@ void FurnaceGUI::doAction(int what) {
} else {
wantScrollList=true;
MARK_MODIFIED;
RESET_WAVE_MACRO_ZOOM;
}
break;
case GUI_ACTION_WAVE_LIST_DUPLICATE:
@ -657,6 +658,7 @@ void FurnaceGUI::doAction(int what) {
(*e->song.wave[curWave])=(*e->song.wave[prevWave]);
wantScrollList=true;
MARK_MODIFIED;
RESET_WAVE_MACRO_ZOOM;
}
}
break;
@ -1326,6 +1328,7 @@ void FurnaceGUI::doAction(int what) {
}
nextWindow=GUI_WINDOW_WAVE_EDIT;
MARK_MODIFIED;
RESET_WAVE_MACRO_ZOOM;
}
}
break;

1
src/gui/gui.cpp
View file

@ -3884,6 +3884,7 @@ bool FurnaceGUI::loop() {
showError("cannot load wavetable! ("+e->getLastError()+")");
} else {
MARK_MODIFIED;
RESET_WAVE_MACRO_ZOOM;
}
}
break;

6
src/gui/gui.h
View file

@ -47,6 +47,12 @@
#define MARK_MODIFIED modified=true;
#define WAKE_UP drawHalt=16;
#define RESET_WAVE_MACRO_ZOOM \
for (DivInstrument* _wi: e->song.ins) { \
_wi->std.waveMacro.vZoom=-1; \
_wi->std.waveMacro.vScroll=-1; \
}
#define BIND_FOR(x) getKeyName(actionKeys[x],true).c_str()
// TODO:

2
src/gui/insEdit.cpp
View file

@ -4227,7 +4227,7 @@ void FurnaceGUI::drawInsEdit() {
}
const char* waveLabel="Waveform";
int waveMax=(ins->type==DIV_INS_AY || ins->type==DIV_INS_AY8930 || ins->type==DIV_INS_VERA)?3:255;
int waveMax=(ins->type==DIV_INS_AY || ins->type==DIV_INS_AY8930 || ins->type==DIV_INS_VERA)?3:(MAX(1,e->song.waveLen-1));
bool bitMode=false;
if (ins->type==DIV_INS_C64 || ins->type==DIV_INS_AY || ins->type==DIV_INS_AY8930 || ins->type==DIV_INS_SAA1099) {
bitMode=true;