GUI: fix pattern cell ID conflict
Co-authored-by: Eknous-P <ehovakimyan053@gmail.com>
This commit is contained in:
parent
43b369495b
commit
e32a3369f2
|
@ -1233,7 +1233,9 @@ void FurnaceGUI::drawPattern() {
|
||||||
} else {
|
} else {
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_Alpha,ImGui::GetStyle().Alpha*ImGui::GetStyle().DisabledAlpha);
|
ImGui::PushStyleVar(ImGuiStyleVar_Alpha,ImGui::GetStyle().Alpha*ImGui::GetStyle().DisabledAlpha);
|
||||||
}
|
}
|
||||||
|
ImGui::PushID("prevPatterns");
|
||||||
for (int i=0; i<dummyRows-1; i++) {
|
for (int i=0; i<dummyRows-1; i++) {
|
||||||
|
ImGui::PushID(i);
|
||||||
patternRow(viewRow,e->isPlaying(),lineHeight,chans,viewOrder,patCache,orderLock);
|
patternRow(viewRow,e->isPlaying(),lineHeight,chans,viewOrder,patCache,orderLock);
|
||||||
if (++viewRow>=e->curSubSong->patLen) {
|
if (++viewRow>=e->curSubSong->patLen) {
|
||||||
viewRow=0;
|
viewRow=0;
|
||||||
|
@ -1242,7 +1244,9 @@ void FurnaceGUI::drawPattern() {
|
||||||
patCache[j]=e->curPat[j].getPattern(e->curOrders->ord[j][viewOrder],false);
|
patCache[j]=e->curPat[j].getPattern(e->curOrders->ord[j][viewOrder],false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
ImGui::PopID();
|
||||||
}
|
}
|
||||||
|
ImGui::PopID();
|
||||||
if (orderLock) {
|
if (orderLock) {
|
||||||
ImGui::EndDisabled();
|
ImGui::EndDisabled();
|
||||||
} else {
|
} else {
|
||||||
|
@ -1273,7 +1277,9 @@ void FurnaceGUI::drawPattern() {
|
||||||
} else {
|
} else {
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_Alpha,ImGui::GetStyle().Alpha*ImGui::GetStyle().DisabledAlpha);
|
ImGui::PushStyleVar(ImGuiStyleVar_Alpha,ImGui::GetStyle().Alpha*ImGui::GetStyle().DisabledAlpha);
|
||||||
}
|
}
|
||||||
|
ImGui::PushID("nextPatterns");
|
||||||
for (int i=0; i<=dummyRows; i++) {
|
for (int i=0; i<=dummyRows; i++) {
|
||||||
|
ImGui::PushID(i);
|
||||||
patternRow(viewRow,e->isPlaying(),lineHeight,chans,viewOrder,patCache,orderLock);
|
patternRow(viewRow,e->isPlaying(),lineHeight,chans,viewOrder,patCache,orderLock);
|
||||||
if (++viewRow>=e->curSubSong->patLen) {
|
if (++viewRow>=e->curSubSong->patLen) {
|
||||||
viewRow=0;
|
viewRow=0;
|
||||||
|
@ -1282,7 +1288,9 @@ void FurnaceGUI::drawPattern() {
|
||||||
patCache[j]=e->curPat[j].getPattern(e->curOrders->ord[j][viewOrder],false);
|
patCache[j]=e->curPat[j].getPattern(e->curOrders->ord[j][viewOrder],false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
ImGui::PopID();
|
||||||
}
|
}
|
||||||
|
ImGui::PopID();
|
||||||
if (orderLock) {
|
if (orderLock) {
|
||||||
ImGui::EndDisabled();
|
ImGui::EndDisabled();
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue