From 6fb23ab04ba53a78483d01fe49beea4340d75e09 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Thu, 16 Feb 2023 05:54:46 -0500 Subject: [PATCH] GUI: add option to disable fade-in during startup --- src/gui/gui.cpp | 2 +- src/gui/gui.h | 2 ++ src/gui/settings.cpp | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 6d04d3821..654f126ba 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -5238,7 +5238,7 @@ bool FurnaceGUI::loop() { SDL_RenderClear(sdlRend); mustClear--; } else { - if (initialScreenWipe>0.0f) { + if (initialScreenWipe>0.0f && !settings.disableFadeIn) { WAKE_UP; initialScreenWipe-=ImGui::GetIO().DeltaTime*5.0f; if (initialScreenWipe>0.0f) { diff --git a/src/gui/gui.h b/src/gui/gui.h index c1f267b1e..8708a2ce5 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -1336,6 +1336,7 @@ class FurnaceGUI { int macroLayout; float doubleClickTime; int oneDigitEffects; + int disableFadeIn; unsigned int maxUndoSteps; String mainFontPath; String patFontPath; @@ -1473,6 +1474,7 @@ class FurnaceGUI { macroLayout(0), doubleClickTime(0.3f), oneDigitEffects(0), + disableFadeIn(0), maxUndoSteps(100), mainFontPath(""), patFontPath(""), diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index e80d9fa01..3ce7b0a40 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -1680,6 +1680,11 @@ void FurnaceGUI::drawSettings() { settings.frameBorders=frameBordersB; } + bool disableFadeInB=settings.disableFadeIn; + if (ImGui::Checkbox("Disable fade-in during startup",&disableFadeInB)) { + settings.disableFadeIn=disableFadeInB; + } + ImGui::Separator(); ImGui::Text("Oscilloscope settings:"); @@ -2586,6 +2591,7 @@ void FurnaceGUI::syncSettings() { settings.macroLayout=e->getConfInt("macroLayout",0); settings.doubleClickTime=e->getConfFloat("doubleClickTime",0.3f); settings.oneDigitEffects=e->getConfInt("oneDigitEffects",0); + settings.disableFadeIn=e->getConfInt("disableFadeIn",0); clampSetting(settings.mainFontSize,2,96); clampSetting(settings.patFontSize,2,96); @@ -2698,6 +2704,7 @@ void FurnaceGUI::syncSettings() { clampSetting(settings.macroLayout,0,4); clampSetting(settings.doubleClickTime,0.02,1.0); clampSetting(settings.oneDigitEffects,0,1); + clampSetting(settings.disableFadeIn,0,1); if (settings.exportLoops<0.0) settings.exportLoops=0.0; if (settings.exportFadeOut<0.0) settings.exportFadeOut=0.0; @@ -2904,6 +2911,7 @@ void FurnaceGUI::commitSettings() { e->setConf("macroLayout",settings.macroLayout); e->setConf("doubleClickTime",settings.doubleClickTime); e->setConf("oneDigitEffects",settings.oneDigitEffects); + e->setConf("disableFadeIn",settings.disableFadeIn); // colors for (int i=0; i