etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-27 06:53:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: prepare to add more macro editor layouts

Browse source
This commit is contained in:
tildearrow 2022-11-10 19:21:01 -05:00
parent bf5b088a54
commit c7b2227ee0
3 changed files with 582 additions and 481 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/gui.h
View file

@ -1222,6 +1222,7 @@ class FurnaceGUI {
int persistFadeOut;
int exportLoops;
double exportFadeOut;
int macroLayout;
unsigned int maxUndoSteps;
String mainFontPath;
String patFontPath;
@ -1352,6 +1353,7 @@ class FurnaceGUI {
persistFadeOut(1),
exportLoops(0),
exportFadeOut(0.0),
macroLayout(0),
maxUndoSteps(100),
mainFontPath(""),
patFontPath(""),
@ -1684,6 +1686,7 @@ class FurnaceGUI {
void patternRow(int i, bool isPlaying, float lineHeight, int chans, int ord, const DivPattern** patCache, bool inhibitSel);
void drawMacroEdit(FurnaceGUIMacroDesc& i, int totalFit, float availableWidth, int index);
void drawMacros(std::vector<FurnaceGUIMacroDesc>& macros);
void actualWaveList();

1040
src/gui/insEdit.cpp
View file

File diff suppressed because it is too large Load diff

20
src/gui/settings.cpp
View file

@ -1326,6 +1326,23 @@ void FurnaceGUI::drawSettings() {
settings.susPosition=1;
}
ImGui::Text("Macro editor layout:");
if (ImGui::RadioButton("Unified##mel0",settings.macroLayout==0)) {
settings.macroLayout=0;
}
if (ImGui::RadioButton("Mobile##mel1",settings.macroLayout==1)) {
settings.macroLayout=1;
}
if (ImGui::RadioButton("Grid##mel2",settings.macroLayout==2)) {
settings.macroLayout=2;
}
if (ImGui::RadioButton("Single (with list)##mel3",settings.macroLayout==3)) {
settings.macroLayout=3;
}
if (ImGui::RadioButton("Single (combo box)##mel4",settings.macroLayout==4)) {
settings.macroLayout=4;
}
ImGui::Separator();
ImGui::Text("Namco 163 chip name");
@ -2405,6 +2422,7 @@ void FurnaceGUI::syncSettings() {
settings.persistFadeOut=e->getConfInt("persistFadeOut",1);
settings.exportLoops=e->getConfInt("exportLoops",0);
settings.exportFadeOut=e->getConfDouble("exportFadeOut",0.0);
settings.macroLayout=e->getConfInt("macroLayout",0);
clampSetting(settings.mainFontSize,2,96);
clampSetting(settings.patFontSize,2,96);
@ -2511,6 +2529,7 @@ void FurnaceGUI::syncSettings() {
clampSetting(settings.centerPattern,0,1);
clampSetting(settings.ordersCursor,0,1);
clampSetting(settings.persistFadeOut,0,1);
clampSetting(settings.macroLayout,0,4);
if (settings.exportLoops<0.0) settings.exportLoops=0.0;
if (settings.exportFadeOut<0.0) settings.exportFadeOut=0.0;
@ -2683,6 +2702,7 @@ void FurnaceGUI::commitSettings() {
e->setConf("persistFadeOut",settings.persistFadeOut);
e->setConf("exportLoops",settings.exportLoops);
e->setConf("exportFadeOut",settings.exportFadeOut);
e->setConf("macroLayout",settings.macroLayout);
// colors
for (int i=0; i<GUI_COLOR_MAX; i++) {