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

you broke my build

Browse source
This commit is contained in:
tildearrow 2024-04-10 12:42:25 -05:00
parent c8661648c5
commit d5b3a6712d
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/gui.h
View file

@ -2614,7 +2614,7 @@ class FurnaceGUI {
void waveListItem(int index, float* wavePreview, int dir, int asset); void waveListItem(int index, float* wavePreview, int dir, int asset);
void sampleListItem(int index, int dir, int asset); void sampleListItem(int index, int dir, int asset);
void drawSysDefs(std::vector<FurnaceGUISysDef>& category, bool& accepted, std::vector<int>& sysDefStack); void drawSysDefs(std::vector<FurnaceGUISysDef>& category, bool& accepted, std::vector<int>& sysDefStack, bool& alreadyHover);
void printPresets(std::vector<FurnaceGUISysDef>& items, size_t depth, std::vector<int>& depthStack); void printPresets(std::vector<FurnaceGUISysDef>& items, size_t depth, std::vector<int>& depthStack);
FurnaceGUISysDef* selectPreset(std::vector<FurnaceGUISysDef>& items); FurnaceGUISysDef* selectPreset(std::vector<FurnaceGUISysDef>& items);

10
src/gui/newSong.cpp
View file

@ -24,7 +24,7 @@
String sysDefID; String sysDefID;
void FurnaceGUI::drawSysDefs(std::vector<FurnaceGUISysDef>& category, bool& accepted, std::vector<int>& sysDefStack) { void FurnaceGUI::drawSysDefs(std::vector<FurnaceGUISysDef>& category, bool& accepted, std::vector<int>& sysDefStack, bool& alreadyHover) {
int index=0; int index=0;
String sysDefIDLeader="##NS"; String sysDefIDLeader="##NS";
for (int i: sysDefStack) { for (int i: sysDefStack) {
@ -58,11 +58,12 @@ void FurnaceGUI::drawSysDefs(std::vector<FurnaceGUISysDef>& category, bool& acce
} }
if (treeNode) { if (treeNode) {
sysDefStack.push_back(index); sysDefStack.push_back(index);
drawSysDefs(i.subDefs,accepted,sysDefStack); drawSysDefs(i.subDefs,accepted,sysDefStack,alreadyHover);
sysDefStack.erase(sysDefStack.end()-1); sysDefStack.erase(sysDefStack.end()-1);
ImGui::TreePop(); ImGui::TreePop();
} }
if (isHovered) { if (isHovered && !alreadyHover) {
alreadyHover=true;
if (ImGui::BeginTooltip()) { if (ImGui::BeginTooltip()) {
std::map<DivSystem,int> chipCounts; std::map<DivSystem,int> chipCounts;
std::vector<DivSystem> chips; std::vector<DivSystem> chips;
@ -211,8 +212,9 @@ void FurnaceGUI::drawNewSong() {
ImGui::Text("no results"); ImGui::Text("no results");
} }
} else { } else {
bool alreadyHover=false;
sysDefStack.push_back(newSongQuery.empty()?newSongCategory:-1); sysDefStack.push_back(newSongQuery.empty()?newSongCategory:-1);
drawSysDefs(category,accepted,sysDefStack); drawSysDefs(category,accepted,sysDefStack,alreadyHover);
sysDefStack.erase(sysDefStack.end()-1); sysDefStack.erase(sysDefStack.end()-1);
} }
ImGui::EndTable(); ImGui::EndTable();

3
src/gui/settings.cpp
View file

@ -567,7 +567,6 @@ void FurnaceGUI::drawSettings() {
// SUBSECTION VIBRATION // SUBSECTION VIBRATION
CONFIG_SUBSECTION("Vibration"); CONFIG_SUBSECTION("Vibration");
ImGui::Indent();
if (ImGui::SliderFloat("Strength",&settings.vibrationStrength,0.0f,1.0f)) { if (ImGui::SliderFloat("Strength",&settings.vibrationStrength,0.0f,1.0f)) {
if (settings.vibrationStrength<0.0f) settings.vibrationStrength=0.0f; if (settings.vibrationStrength<0.0f) settings.vibrationStrength=0.0f;
if (settings.vibrationStrength>1.0f) settings.vibrationStrength=1.0f; if (settings.vibrationStrength>1.0f) settings.vibrationStrength=1.0f;
@ -578,7 +577,7 @@ void FurnaceGUI::drawSettings() {
if (settings.vibrationLength<10) settings.vibrationLength=10; if (settings.vibrationLength<10) settings.vibrationLength=10;
if (settings.vibrationLength>500) settings.vibrationLength=500; if (settings.vibrationLength>500) settings.vibrationLength=500;
settingsChanged=true; settingsChanged=true;
ImGui::Unindent(); }
#endif #endif
// SUBSECTION FILE // SUBSECTION FILE