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

GUI: add setting for double click time

Browse source
This commit is contained in:
tildearrow 2023-01-14 14:07:50 -05:00
parent 26e424fe9f
commit b644de1c1f
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/gui.cpp
View file

@ -5148,7 +5148,7 @@ bool FurnaceGUI::loop() {
renderTimeDelta=renderTimeEnd-renderTimeBegin; renderTimeDelta=renderTimeEnd-renderTimeBegin;
eventTimeDelta=eventTimeEnd-eventTimeBegin; eventTimeDelta=eventTimeEnd-eventTimeBegin;
soloTimeout-=ImGui::GetIO().DeltaTime*60.0f; soloTimeout-=ImGui::GetIO().DeltaTime;
if (soloTimeout<0) { if (soloTimeout<0) {
soloTimeout=0; soloTimeout=0;
} else { } else {

2
src/gui/gui.h
View file

@ -1294,6 +1294,7 @@ class FurnaceGUI {
int exportLoops; int exportLoops;
double exportFadeOut; double exportFadeOut;
int macroLayout; int macroLayout;
float doubleClickTime;
unsigned int maxUndoSteps; unsigned int maxUndoSteps;
String mainFontPath; String mainFontPath;
String patFontPath; String patFontPath;
@ -1428,6 +1429,7 @@ class FurnaceGUI {
exportLoops(0), exportLoops(0),
exportFadeOut(0.0), exportFadeOut(0.0),
macroLayout(0), macroLayout(0),
doubleClickTime(0.3f),
maxUndoSteps(100), maxUndoSteps(100),
mainFontPath(""), mainFontPath(""),
patFontPath(""), patFontPath(""),

2
src/gui/pattern.cpp
View file

@ -755,7 +755,7 @@ void FurnaceGUI::drawPattern() {
soloTimeout=0; soloTimeout=0;
} else { } else {
e->toggleMute(i); e->toggleMute(i);
soloTimeout=20; soloTimeout=settings.doubleClickTime;
soloChan=i; soloChan=i;
} }
} }

11
src/gui/settings.cpp
View file

@ -492,6 +492,13 @@ void FurnaceGUI::drawSettings() {
ImGui::Separator(); ImGui::Separator();
if (CWSliderFloat("Double-click time (seconds)",&settings.doubleClickTime,0.02,1.0,"%.2f")) {
if (settings.doubleClickTime<0.02) settings.doubleClickTime=0.02;
if (settings.doubleClickTime>1.0) settings.doubleClickTime=1.0;
applyUISettings(false);
}
ImGui::Text("Toggle channel solo on:"); ImGui::Text("Toggle channel solo on:");
if (ImGui::RadioButton("Right-click or double-click##soloA",settings.soloAction==0)) { if (ImGui::RadioButton("Right-click or double-click##soloA",settings.soloAction==0)) {
settings.soloAction=0; settings.soloAction=0;
@ -2557,6 +2564,7 @@ void FurnaceGUI::syncSettings() {
settings.exportLoops=e->getConfInt("exportLoops",0); settings.exportLoops=e->getConfInt("exportLoops",0);
settings.exportFadeOut=e->getConfDouble("exportFadeOut",0.0); settings.exportFadeOut=e->getConfDouble("exportFadeOut",0.0);
settings.macroLayout=e->getConfInt("macroLayout",0); settings.macroLayout=e->getConfInt("macroLayout",0);
settings.doubleClickTime=e->getConfFloat("doubleClickTime",0.3f);
clampSetting(settings.mainFontSize,2,96); clampSetting(settings.mainFontSize,2,96);
clampSetting(settings.patFontSize,2,96); clampSetting(settings.patFontSize,2,96);
@ -2667,6 +2675,7 @@ void FurnaceGUI::syncSettings() {
clampSetting(settings.ordersCursor,0,1); clampSetting(settings.ordersCursor,0,1);
clampSetting(settings.persistFadeOut,0,1); clampSetting(settings.persistFadeOut,0,1);
clampSetting(settings.macroLayout,0,4); clampSetting(settings.macroLayout,0,4);
clampSetting(settings.doubleClickTime,0.02,1.0);
if (settings.exportLoops<0.0) settings.exportLoops=0.0; if (settings.exportLoops<0.0) settings.exportLoops=0.0;
if (settings.exportFadeOut<0.0) settings.exportFadeOut=0.0; if (settings.exportFadeOut<0.0) settings.exportFadeOut=0.0;
@ -2870,6 +2879,7 @@ void FurnaceGUI::commitSettings() {
e->setConf("exportLoops",settings.exportLoops); e->setConf("exportLoops",settings.exportLoops);
e->setConf("exportFadeOut",settings.exportFadeOut); e->setConf("exportFadeOut",settings.exportFadeOut);
e->setConf("macroLayout",settings.macroLayout); e->setConf("macroLayout",settings.macroLayout);
e->setConf("doubleClickTime",settings.doubleClickTime);
// colors // colors
for (int i=0; i<GUI_COLOR_MAX; i++) { for (int i=0; i<GUI_COLOR_MAX; i++) {
@ -3444,6 +3454,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
ImGui::GetIO().ConfigInputTrickleEventQueue=settings.eventDelay; ImGui::GetIO().ConfigInputTrickleEventQueue=settings.eventDelay;
ImGui::GetIO().ConfigWindowsMoveFromTitleBarOnly=settings.moveWindowTitle; ImGui::GetIO().ConfigWindowsMoveFromTitleBarOnly=settings.moveWindowTitle;
ImGui::GetIO().ConfigInertialScrollToleranceSqr=pow(dpiScale*4.0f,2.0f); ImGui::GetIO().ConfigInertialScrollToleranceSqr=pow(dpiScale*4.0f,2.0f);
ImGui::GetIO().MouseDoubleClickTime=settings.doubleClickTime;
for (int i=0; i<256; i++) { for (int i=0; i<256; i++) {
ImVec4& base=uiColors[GUI_COLOR_PATTERN_EFFECT_PITCH]; ImVec4& base=uiColors[GUI_COLOR_PATTERN_EFFECT_PITCH];