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

Merge branch 'BlastBrothers-compact-sample-editor'

Browse source
This commit is contained in:
tildearrow 2022-04-12 02:40:18 -05:00
parent 455cccdef0 5a5f800297
commit a5339bd37d
3 changed files with 994 additions and 505 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/gui.h
View file

@ -775,6 +775,7 @@ class FurnaceGUI {
int roundedMenus; int roundedMenus;
int loadJapanese; int loadJapanese;
int fmLayout; int fmLayout;
int sampleLayout;
int susPosition; int susPosition;
int effectCursorDir; int effectCursorDir;
int cursorPastePos; int cursorPastePos;
@ -838,6 +839,7 @@ class FurnaceGUI {
roundedMenus(0), roundedMenus(0),
loadJapanese(0), loadJapanese(0),
fmLayout(0), fmLayout(0),
sampleLayout(0),
susPosition(0), susPosition(0),
effectCursorDir(1), effectCursorDir(1),
cursorPastePos(1), cursorPastePos(1),

1487
src/gui/sampleEdit.cpp
View file

File diff suppressed because it is too large Load diff

10
src/gui/settings.cpp
View file

@ -832,6 +832,8 @@ void FurnaceGUI::drawSettings() {
settings.susPosition=1; settings.susPosition=1;
} }
ImGui::Separator();
bool macroViewB=settings.macroView; bool macroViewB=settings.macroView;
if (ImGui::Checkbox("Classic macro view (standard macros only; deprecated!)",&macroViewB)) { if (ImGui::Checkbox("Classic macro view (standard macros only; deprecated!)",&macroViewB)) {
settings.macroView=macroViewB; settings.macroView=macroViewB;
@ -878,6 +880,11 @@ void FurnaceGUI::drawSettings() {
ImGui::Separator(); ImGui::Separator();
bool sampleLayoutB=settings.sampleLayout;
if (ImGui::Checkbox("Use compact sample editor",&sampleLayoutB)) {
settings.sampleLayout=sampleLayoutB;
}
bool roundedWindowsB=settings.roundedWindows; bool roundedWindowsB=settings.roundedWindows;
if (ImGui::Checkbox("Rounded window corners",&roundedWindowsB)) { if (ImGui::Checkbox("Rounded window corners",&roundedWindowsB)) {
settings.roundedWindows=roundedWindowsB; settings.roundedWindows=roundedWindowsB;
@ -1502,6 +1509,7 @@ void FurnaceGUI::syncSettings() {
settings.roundedMenus=e->getConfInt("roundedMenus",0); settings.roundedMenus=e->getConfInt("roundedMenus",0);
settings.loadJapanese=e->getConfInt("loadJapanese",0); settings.loadJapanese=e->getConfInt("loadJapanese",0);
settings.fmLayout=e->getConfInt("fmLayout",0); settings.fmLayout=e->getConfInt("fmLayout",0);
settings.sampleLayout=e->getConfInt("sampleLayout",0);
settings.susPosition=e->getConfInt("susPosition",0); settings.susPosition=e->getConfInt("susPosition",0);
settings.effectCursorDir=e->getConfInt("effectCursorDir",1); settings.effectCursorDir=e->getConfInt("effectCursorDir",1);
settings.cursorPastePos=e->getConfInt("cursorPastePos",1); settings.cursorPastePos=e->getConfInt("cursorPastePos",1);
@ -1564,6 +1572,7 @@ void FurnaceGUI::syncSettings() {
clampSetting(settings.titleBarSys,0,1); clampSetting(settings.titleBarSys,0,1);
clampSetting(settings.frameBorders,0,1); clampSetting(settings.frameBorders,0,1);
clampSetting(settings.effectDeletionAltersValue,0,1); clampSetting(settings.effectDeletionAltersValue,0,1);
clampSetting(settings.sampleLayout,0,1);
// keybinds // keybinds
for (int i=0; i<GUI_ACTION_MAX; i++) { for (int i=0; i<GUI_ACTION_MAX; i++) {
@ -1632,6 +1641,7 @@ void FurnaceGUI::commitSettings() {
e->setConf("roundedMenus",settings.roundedMenus); e->setConf("roundedMenus",settings.roundedMenus);
e->setConf("loadJapanese",settings.loadJapanese); e->setConf("loadJapanese",settings.loadJapanese);
e->setConf("fmLayout",settings.fmLayout); e->setConf("fmLayout",settings.fmLayout);
e->setConf("sampleLayout",settings.sampleLayout);
e->setConf("susPosition",settings.susPosition); e->setConf("susPosition",settings.susPosition);
e->setConf("effectCursorDir",settings.effectCursorDir); e->setConf("effectCursorDir",settings.effectCursorDir);
e->setConf("cursorPastePos",settings.cursorPastePos); e->setConf("cursorPastePos",settings.cursorPastePos);