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

GUI: render more than the previous/next pattern

Browse source 
no more silly length-1 tricks
This commit is contained in:
tildearrow 2025-07-04 18:28:47 -05:00
parent 15a3a4b82d
commit bc15ae0812
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/gui/pattern.cpp
View file

@ -1218,12 +1218,25 @@ void FurnaceGUI::drawPattern() {
// previous pattern // previous pattern
ImGui::PushStyleVar(ImGuiStyleVar_FrameShading,0.0f); ImGui::PushStyleVar(ImGuiStyleVar_FrameShading,0.0f);
if (settings.viewPrevPattern) { if (settings.viewPrevPattern) {
if ((ord-1)>=0) for (int i=0; i<chans; i++) { int viewOrder=ord;
patCache[i]=e->curPat[i].getPattern(e->curOrders->ord[i][ord-1],false); int viewRow=-dummyRows+1;
while (viewRow<0) {
viewOrder--;
viewRow+=e->curSubSong->patLen;
}
if (viewOrder>=0 && viewOrder<e->curSubSong->ordersLen) for (int i=0; i<chans; i++) {
patCache[i]=e->curPat[i].getPattern(e->curOrders->ord[i][viewOrder],false);
} }
ImGui::PushStyleVar(ImGuiStyleVar_Alpha,ImGui::GetStyle().Alpha*ImGui::GetStyle().DisabledAlpha); ImGui::PushStyleVar(ImGuiStyleVar_Alpha,ImGui::GetStyle().Alpha*ImGui::GetStyle().DisabledAlpha);
for (int i=0; i<dummyRows-1; i++) { for (int i=0; i<dummyRows-1; i++) {
patternRow(e->curSubSong->patLen+i-dummyRows+1,e->isPlaying(),lineHeight,chans,ord-1,patCache,false); patternRow(viewRow,e->isPlaying(),lineHeight,chans,viewOrder,patCache,false);
if (++viewRow>=e->curSubSong->patLen) {
viewRow=0;
viewOrder++;
if (viewOrder>=0 && viewOrder<e->curSubSong->ordersLen) for (int j=0; j<chans; j++) {
patCache[j]=e->curPat[j].getPattern(e->curOrders->ord[j][viewOrder],false);
}
}
} }
ImGui::PopStyleVar(); ImGui::PopStyleVar();
} else { } else {
@ -1241,12 +1254,21 @@ void FurnaceGUI::drawPattern() {
} }
// next pattern // next pattern
if (settings.viewPrevPattern) { if (settings.viewPrevPattern) {
if ((ord+1)<e->curSubSong->ordersLen) for (int i=0; i<chans; i++) { int viewOrder=ord+1;
int viewRow=0;
if (viewOrder<e->curSubSong->ordersLen) for (int i=0; i<chans; i++) {
patCache[i]=e->curPat[i].getPattern(e->curOrders->ord[i][ord+1],true); patCache[i]=e->curPat[i].getPattern(e->curOrders->ord[i][ord+1],true);
} }
ImGui::PushStyleVar(ImGuiStyleVar_Alpha,ImGui::GetStyle().Alpha*ImGui::GetStyle().DisabledAlpha); ImGui::PushStyleVar(ImGuiStyleVar_Alpha,ImGui::GetStyle().Alpha*ImGui::GetStyle().DisabledAlpha);
for (int i=0; i<=dummyRows; i++) { for (int i=0; i<=dummyRows; i++) {
patternRow(i,e->isPlaying(),lineHeight,chans,ord+1,patCache,false); patternRow(viewRow,e->isPlaying(),lineHeight,chans,viewOrder,patCache,false);
if (++viewRow>=e->curSubSong->patLen) {
viewRow=0;
viewOrder++;
if (viewOrder>=0 && viewOrder<e->curSubSong->ordersLen) for (int j=0; j<chans; j++) {
patCache[j]=e->curPat[j].getPattern(e->curOrders->ord[j][viewOrder],false);
}
}
} }
ImGui::PopStyleVar(); ImGui::PopStyleVar();
} else { } else {