Merge branch 'master' into feature/esfm

This commit is contained in:
Kagamiin~ 2023-10-17 15:53:21 -03:00
commit 8ae86f79a8
860 changed files with 517374 additions and 103 deletions

View file

@ -3025,6 +3025,14 @@ void FurnaceGUI::drawInsEdit() {
ins->type=(DivInstrumentType)insType;
}
*/
bool warnType=true;
for (DivInstrumentType i: e->getPossibleInsTypes()) {
if (i==insType) {
warnType=false;
}
}
pushWarningColor(warnType,warnType && failedNoteOn);
if (ImGui::BeginCombo("##Type",insTypes[insType][0])) {
std::vector<DivInstrumentType> insTypeList;
if (settings.displayAllInsTypes) {
@ -3082,7 +3090,12 @@ void FurnaceGUI::drawInsEdit() {
}
}
ImGui::EndCombo();
} else if (warnType) {
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("none of the currently present chips are able to play this instrument type!");
}
}
popWarningColor();
ImGui::EndTable();
}