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

add setting for choosing whether to save window position

Browse source
This commit is contained in:
aurora 2022-08-22 22:17:19 +03:00
parent 8b3c4a84a8
commit 0e847dc1aa
3 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/gui.cpp
View file

@ -4685,8 +4685,8 @@ bool FurnaceGUI::finish() {
// commit last window size // commit last window size
e->setConf("lastWindowWidth",scrConfW); e->setConf("lastWindowWidth",scrConfW);
e->setConf("lastWindowHeight",scrConfH); e->setConf("lastWindowHeight",scrConfH);
e->setConf("lastWindowX",scrConfX); e->setConf("lastWindowX",settings.saveWindowPos?scrConfX:(int)SDL_WINDOWPOS_CENTERED);
e->setConf("lastWindowY",scrConfY); e->setConf("lastWindowY",settings.saveWindowPos?scrConfY:(int)SDL_WINDOWPOS_CENTERED);
e->setConf("lastWindowMax",scrMax); e->setConf("lastWindowMax",scrMax);
e->setConf("tempoView",tempoView); e->setConf("tempoView",tempoView);

1
src/gui/gui.h
View file

@ -1129,6 +1129,7 @@ class FurnaceGUI {
int dragMovesSelection; int dragMovesSelection;
int unsignedDetune; int unsignedDetune;
int noThreadedInput; int noThreadedInput;
int saveWindowPos;
int clampSamples; int clampSamples;
int saveUnusedPatterns; int saveUnusedPatterns;
int channelColors; int channelColors;

35
src/gui/settings.cpp
View file

@ -259,7 +259,7 @@ void FurnaceGUI::drawSettings() {
} }
ImGui::Separator(); ImGui::Separator();
ImGui::Text("Initial system:"); ImGui::Text("Initial system:");
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Current system")) { if (ImGui::Button("Current system")) {
@ -369,7 +369,7 @@ void FurnaceGUI::drawSettings() {
} rightClickable } rightClickable
ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x-(50.0f*dpiScale)); ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x-(50.0f*dpiScale));
CWSliderScalar("Panning",ImGuiDataType_S8,&settings.initialSys[i+2],&_MINUS_ONE_HUNDRED_TWENTY_SEVEN,&_ONE_HUNDRED_TWENTY_SEVEN); rightClickable CWSliderScalar("Panning",ImGuiDataType_S8,&settings.initialSys[i+2],&_MINUS_ONE_HUNDRED_TWENTY_SEVEN,&_ONE_HUNDRED_TWENTY_SEVEN); rightClickable
// oh please MSVC don't cry // oh please MSVC don't cry
if (ImGui::TreeNode("Configure")) { if (ImGui::TreeNode("Configure")) {
drawSysConf(-1,(DivSystem)settings.initialSys[i],(unsigned int&)settings.initialSys[i+3],false); drawSysConf(-1,(DivSystem)settings.initialSys[i],(unsigned int&)settings.initialSys[i+3],false);
@ -452,7 +452,7 @@ void FurnaceGUI::drawSettings() {
if (ImGui::Checkbox("Double click selects entire column",&doubleClickColumnB)) { if (ImGui::Checkbox("Double click selects entire column",&doubleClickColumnB)) {
settings.doubleClickColumn=doubleClickColumnB; settings.doubleClickColumn=doubleClickColumnB;
} }
bool allowEditDockingB=settings.allowEditDocking; bool allowEditDockingB=settings.allowEditDocking;
if (ImGui::Checkbox("Allow docking editors",&allowEditDockingB)) { if (ImGui::Checkbox("Allow docking editors",&allowEditDockingB)) {
settings.allowEditDocking=allowEditDockingB; settings.allowEditDocking=allowEditDockingB;
@ -509,6 +509,14 @@ void FurnaceGUI::drawSettings() {
ImGui::SetTooltip("threaded input processes key presses for note preview on a separate thread (on supported platforms), which reduces latency.\nhowever, crashes have been reported when threaded input is on. enable this option if that is the case."); ImGui::SetTooltip("threaded input processes key presses for note preview on a separate thread (on supported platforms), which reduces latency.\nhowever, crashes have been reported when threaded input is on. enable this option if that is the case.");
} }
bool saveWindowPosB=settings.saveWindowPos;
if (ImGui::Checkbox("Remember window location",&saveWindowPosB)) {
settings.saveWindowPos=saveWindowPosB;
}
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("remembers where window was last located on start-up. When disabled, window will start in a defaul location.");
}
bool blankInsB=settings.blankIns; bool blankInsB=settings.blankIns;
if (ImGui::Checkbox("New instruments are blank",&blankInsB)) { if (ImGui::Checkbox("New instruments are blank",&blankInsB)) {
settings.blankIns=blankInsB; settings.blankIns=blankInsB;
@ -639,7 +647,7 @@ void FurnaceGUI::drawSettings() {
BUFFER_SIZE_SELECTABLE(2048); BUFFER_SIZE_SELECTABLE(2048);
ImGui::EndCombo(); ImGui::EndCombo();
} }
ImGui::Text("Quality"); ImGui::Text("Quality");
ImGui::SameLine(); ImGui::SameLine();
ImGui::Combo("##Quality",&settings.audioQuality,audioQualities,2); ImGui::Combo("##Quality",&settings.audioQuality,audioQualities,2);
@ -697,7 +705,7 @@ void FurnaceGUI::drawSettings() {
} }
if (hasToReloadMidi) { if (hasToReloadMidi) {
midiMap.read(e->getConfigPath()+DIR_SEPARATOR_STR+"midiIn_"+stripName(settings.midiInDevice)+".cfg"); midiMap.read(e->getConfigPath()+DIR_SEPARATOR_STR+"midiIn_"+stripName(settings.midiInDevice)+".cfg");
midiMap.compile(); midiMap.compile();
} }
@ -1344,7 +1352,7 @@ void FurnaceGUI::drawSettings() {
if (ImGui::Checkbox("Unsigned FM detune values",&unsignedDetuneB)) { if (ImGui::Checkbox("Unsigned FM detune values",&unsignedDetuneB)) {
settings.unsignedDetune=unsignedDetuneB; settings.unsignedDetune=unsignedDetuneB;
} }
// sorry. temporarily disabled until ImGui has a way to add separators in tables arbitrarily. // sorry. temporarily disabled until ImGui has a way to add separators in tables arbitrarily.
/*bool sysSeparatorsB=settings.sysSeparators; /*bool sysSeparatorsB=settings.sysSeparators;
if (ImGui::Checkbox("Add separators between systems in Orders",&sysSeparatorsB)) { if (ImGui::Checkbox("Add separators between systems in Orders",&sysSeparatorsB)) {
@ -1553,12 +1561,12 @@ void FurnaceGUI::drawSettings() {
UI_COLOR_CONFIG(GUI_COLOR_FM_SECONDARY_MOD,"Mod. accent (secondary)"); UI_COLOR_CONFIG(GUI_COLOR_FM_SECONDARY_MOD,"Mod. accent (secondary)");
UI_COLOR_CONFIG(GUI_COLOR_FM_BORDER_MOD,"Mod. border"); UI_COLOR_CONFIG(GUI_COLOR_FM_BORDER_MOD,"Mod. border");
UI_COLOR_CONFIG(GUI_COLOR_FM_BORDER_SHADOW_MOD,"Mod. border shadow"); UI_COLOR_CONFIG(GUI_COLOR_FM_BORDER_SHADOW_MOD,"Mod. border shadow");
UI_COLOR_CONFIG(GUI_COLOR_FM_PRIMARY_CAR,"Car. accent (primary"); UI_COLOR_CONFIG(GUI_COLOR_FM_PRIMARY_CAR,"Car. accent (primary");
UI_COLOR_CONFIG(GUI_COLOR_FM_SECONDARY_CAR,"Car. accent (secondary)"); UI_COLOR_CONFIG(GUI_COLOR_FM_SECONDARY_CAR,"Car. accent (secondary)");
UI_COLOR_CONFIG(GUI_COLOR_FM_BORDER_CAR,"Car. border"); UI_COLOR_CONFIG(GUI_COLOR_FM_BORDER_CAR,"Car. border");
UI_COLOR_CONFIG(GUI_COLOR_FM_BORDER_SHADOW_CAR,"Car. border shadow"); UI_COLOR_CONFIG(GUI_COLOR_FM_BORDER_SHADOW_CAR,"Car. border shadow");
ImGui::TreePop(); ImGui::TreePop();
} }
if (ImGui::TreeNode("Macro Editor")) { if (ImGui::TreeNode("Macro Editor")) {
@ -1917,7 +1925,7 @@ void FurnaceGUI::drawSettings() {
UI_KEYBIND_CONFIG(GUI_ACTION_PAT_COLLAPSE_ROWS); UI_KEYBIND_CONFIG(GUI_ACTION_PAT_COLLAPSE_ROWS);
UI_KEYBIND_CONFIG(GUI_ACTION_PAT_EXPAND_ROWS); UI_KEYBIND_CONFIG(GUI_ACTION_PAT_EXPAND_ROWS);
UI_KEYBIND_CONFIG(GUI_ACTION_PAT_LATCH); UI_KEYBIND_CONFIG(GUI_ACTION_PAT_LATCH);
// TODO: collapse/expand pattern and song // TODO: collapse/expand pattern and song
KEYBIND_CONFIG_END; KEYBIND_CONFIG_END;
@ -2213,6 +2221,7 @@ void FurnaceGUI::syncSettings() {
settings.dragMovesSelection=e->getConfInt("dragMovesSelection",2); settings.dragMovesSelection=e->getConfInt("dragMovesSelection",2);
settings.unsignedDetune=e->getConfInt("unsignedDetune",0); settings.unsignedDetune=e->getConfInt("unsignedDetune",0);
settings.noThreadedInput=e->getConfInt("noThreadedInput",0); settings.noThreadedInput=e->getConfInt("noThreadedInput",0);
settings.saveWindowPos=e->getConfInt("saveWindowPos",1);
settings.initialSysName=e->getConfString("initialSysName",""); settings.initialSysName=e->getConfString("initialSysName","");
settings.clampSamples=e->getConfInt("clampSamples",0); settings.clampSamples=e->getConfInt("clampSamples",0);
settings.noteOffLabel=e->getConfString("noteOffLabel","OFF"); settings.noteOffLabel=e->getConfString("noteOffLabel","OFF");
@ -2313,6 +2322,7 @@ void FurnaceGUI::syncSettings() {
clampSetting(settings.dragMovesSelection,0,2); clampSetting(settings.dragMovesSelection,0,2);
clampSetting(settings.unsignedDetune,0,1); clampSetting(settings.unsignedDetune,0,1);
clampSetting(settings.noThreadedInput,0,1); clampSetting(settings.noThreadedInput,0,1);
clampSetting(settings.saveWindowPos,0,1);
clampSetting(settings.clampSamples,0,1); clampSetting(settings.clampSamples,0,1);
clampSetting(settings.saveUnusedPatterns,0,1); clampSetting(settings.saveUnusedPatterns,0,1);
clampSetting(settings.channelColors,0,2); clampSetting(settings.channelColors,0,2);
@ -2344,7 +2354,7 @@ void FurnaceGUI::syncSettings() {
parseKeybinds(); parseKeybinds();
midiMap.read(e->getConfigPath()+DIR_SEPARATOR_STR+"midiIn_"+stripName(settings.midiInDevice)+".cfg"); midiMap.read(e->getConfigPath()+DIR_SEPARATOR_STR+"midiIn_"+stripName(settings.midiInDevice)+".cfg");
midiMap.compile(); midiMap.compile();
e->setMidiDirect(midiMap.directChannel); e->setMidiDirect(midiMap.directChannel);
@ -2458,6 +2468,7 @@ void FurnaceGUI::commitSettings() {
e->setConf("dragMovesSelection",settings.dragMovesSelection); e->setConf("dragMovesSelection",settings.dragMovesSelection);
e->setConf("unsignedDetune",settings.unsignedDetune); e->setConf("unsignedDetune",settings.unsignedDetune);
e->setConf("noThreadedInput",settings.noThreadedInput); e->setConf("noThreadedInput",settings.noThreadedInput);
e->setConf("saveWindowPos",settings.saveWindowPos);
e->setConf("clampSamples",settings.clampSamples); e->setConf("clampSamples",settings.clampSamples);
e->setConf("noteOffLabel",settings.noteOffLabel); e->setConf("noteOffLabel",settings.noteOffLabel);
e->setConf("noteRelLabel",settings.noteRelLabel); e->setConf("noteRelLabel",settings.noteRelLabel);
@ -3130,7 +3141,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
if ((iconFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(iconFont_compressed_data,iconFont_compressed_size,e->getConfInt("iconSize",16)*dpiScale,&fc,fontRangeIcon))==NULL) { if ((iconFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(iconFont_compressed_data,iconFont_compressed_size,e->getConfInt("iconSize",16)*dpiScale,&fc,fontRangeIcon))==NULL) {
logE("could not load icon font!"); logE("could not load icon font!");
} }
if (settings.mainFontSize==settings.patFontSize && settings.patFont<5 && builtinFontM[settings.patFont]==builtinFont[settings.mainFont]) { if (settings.mainFontSize==settings.patFontSize && settings.patFont<5 && builtinFontM[settings.patFont]==builtinFont[settings.mainFont]) {
logD("using main font for pat font."); logD("using main font for pat font.");
patFont=mainFont; patFont=mainFont;
@ -3164,7 +3175,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
} }
} }
} }
if ((bigFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(font_plexSans_compressed_data,font_plexSans_compressed_size,40*dpiScale))==NULL) { if ((bigFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(font_plexSans_compressed_data,font_plexSans_compressed_size,40*dpiScale))==NULL) {
logE("could not load big UI font!"); logE("could not load big UI font!");
} }