From d4657f4b6c5a0cbe263fcf6ac08ea6fdb580ef73 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Mon, 25 Sep 2023 13:19:27 -0500 Subject: [PATCH] GUI: why are the icons for FM and PSG swapped --- src/gui/editControls.cpp | 4 ++++ src/gui/gui.cpp | 1 + src/gui/guiConst.cpp | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gui/editControls.cpp b/src/gui/editControls.cpp index 2786e536e..b26e773f0 100644 --- a/src/gui/editControls.cpp +++ b/src/gui/editControls.cpp @@ -584,6 +584,10 @@ void FurnaceGUI::drawMobileControls() { if (ImGui::Button("Stats")) { statsOpen=!statsOpen; } + ImGui::SameLine(); + if (ImGui::Button("Grooves")) { + groovesOpen=!groovesOpen; + } if (ImGui::Button("Compat Flags")) { compatFlagsOpen=!compatFlagsOpen; } diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index cfe718276..08f5ca9f0 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -4546,6 +4546,7 @@ bool FurnaceGUI::loop() { MEASURE(readOsc,readOsc()); MEASURE(osc,drawOsc()); MEASURE(chanOsc,drawChanOsc()); + MEASURE(grooves,drawGrooves()); MEASURE(regView,drawRegView()); } else { globalWinFlags=0; diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp index c6069477a..954c29496 100644 --- a/src/gui/guiConst.cpp +++ b/src/gui/guiConst.cpp @@ -120,8 +120,8 @@ const int vgmVersions[7]={ // name, icon, letter icon const char* insTypes[DIV_INS_MAX+1][3]={ - {"SN76489/Sega PSG",ICON_FA_AREA_CHART,ICON_FUR_INS_STD}, - {"FM (OPN)",ICON_FA_BAR_CHART,ICON_FUR_INS_FM}, + {"SN76489/Sega PSG",ICON_FA_BAR_CHART,ICON_FUR_INS_STD}, + {"FM (OPN)",ICON_FA_AREA_CHART,ICON_FUR_INS_FM}, {"Game Boy",ICON_FA_GAMEPAD,ICON_FUR_INS_GB}, {"C64",ICON_FA_KEYBOARD_O,ICON_FUR_INS_C64}, {"Generic Sample",ICON_FA_VOLUME_UP,ICON_FUR_INS_AMIGA},