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

cleanup

Browse source
This commit is contained in:
Eknous-P 2023-07-28 18:39:40 +04:00
parent c6458efbbb
commit dd00d3bc66
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gui/effectList.cpp
View file

@ -23,6 +23,7 @@ void FurnaceGUI::drawEffectList() {
ImGui::Checkbox("System (primary)",&effectShowSysPrimary); ImGui::Checkbox("System (primary)",&effectShowSysPrimary);
ImGui::Checkbox("System (secondary)",&effectShowSysSecondary); ImGui::Checkbox("System (secondary)",&effectShowSysSecondary);
ImGui::Checkbox("Miscellaneous",&effectShowMisc); ImGui::Checkbox("Miscellaneous",&effectShowMisc);
if (ImGui::Button("All")) { if (ImGui::Button("All")) {
effectShowMisc = true; effectShowMisc = true;
effectShowPanning = true; effectShowPanning = true;
@ -46,6 +47,7 @@ void FurnaceGUI::drawEffectList() {
effectShowSysPrimary = false; effectShowSysPrimary = false;
effectShowSysSecondary = false; effectShowSysSecondary = false;
} }
ImGui::EndPopup(); ImGui::EndPopup();
} }
@ -63,6 +65,10 @@ void FurnaceGUI::drawEffectList() {
for (int i=0; i<256; i++) { for (int i=0; i<256; i++) {
const char* name=e->getEffectDesc(i,cursor.xCoarse); const char* name=e->getEffectDesc(i,cursor.xCoarse);
bool effectShow = true; bool effectShow = true;
if (name==prevName) {
continue;
}
prevName=name;
switch (fxColors[i]) { switch (fxColors[i]) {
case GUI_COLOR_PATTERN_EFFECT_MISC: effectShow = effectShowMisc; break; case GUI_COLOR_PATTERN_EFFECT_MISC: effectShow = effectShowMisc; break;
case GUI_COLOR_PATTERN_EFFECT_SONG: effectShow = effectShowSong; break; case GUI_COLOR_PATTERN_EFFECT_SONG: effectShow = effectShowSong; break;
@ -75,10 +81,6 @@ void FurnaceGUI::drawEffectList() {
case GUI_COLOR_PATTERN_EFFECT_SYS_SECONDARY: effectShow = effectShowSysSecondary; break; case GUI_COLOR_PATTERN_EFFECT_SYS_SECONDARY: effectShow = effectShowSysSecondary; break;
default: effectShow = true; break; default: effectShow = true; break;
} }
if (name==prevName) {
continue;
}
prevName=name;
if (name!=NULL && effectShow) { if (name!=NULL && effectShow) {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();