etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add row number base setting 

closes #30
This commit is contained in:
tildearrow 2022-01-19 18:04:07 -05:00
parent f39e522e7e
commit a47a571f0b
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/gui/gui.cpp
View File

@ -433,7 +433,11 @@ void FurnaceGUI::drawOrders() {
if (oldOrder1==i) ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,0x40ffffff);
ImGui::TableNextColumn();
ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_PATTERN_ROW_INDEX]);
snprintf(selID,64,"%.2x##O_S%.2x",i,i);
if (settings.orderRowsBase==1) {
snprintf(selID,64,"%.2x##O_S%.2x",i,i);
} else {
snprintf(selID,64,"%d##O_S%.2x",i,i);
}
if (ImGui::Selectable(selID)) {
e->setOrder(i);
}
@ -1526,7 +1530,11 @@ void FurnaceGUI::drawPattern() {
} else if (e->song.hilightA>0 && !(i%e->song.hilightA)) {
ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg0,ImGui::GetColorU32(uiColors[GUI_COLOR_PATTERN_HI_1]));
}
ImGui::TextColored(uiColors[GUI_COLOR_PATTERN_ROW_INDEX],"%3d ",i);
if (settings.patRowsBase==1) {
ImGui::TextColored(uiColors[GUI_COLOR_PATTERN_ROW_INDEX]," %.2x ",i);
} else {
ImGui::TextColored(uiColors[GUI_COLOR_PATTERN_ROW_INDEX],"%3d ",i);
}
for (int j=0; j<chans; j++) {
int chanVolMax=e->getMaxVolumeChan(j);
DivPattern* pat=e->song.pat[j].getPattern(e->song.orders.ord[j][ord],true);
@ -1958,6 +1966,25 @@ void FurnaceGUI::drawSettings() {
if (settings.patFontSize<3) settings.patFontSize=3;
if (settings.patFontSize>96) settings.patFontSize=96;
}
ImGui::Separator();
ImGui::Text("Orders row number format");
if (ImGui::RadioButton("Decimal##orbD",settings.orderRowsBase==0)) {
settings.orderRowsBase=0;
}
if (ImGui::RadioButton("Hexadecimal##orbH",settings.orderRowsBase==1)) {
settings.orderRowsBase=1;
}
ImGui::Text("Pattern row number format");
if (ImGui::RadioButton("Decimal##prbD",settings.patRowsBase==0)) {
settings.patRowsBase=0;
}
if (ImGui::RadioButton("Hexadecimal##prbH",settings.patRowsBase==1)) {
settings.patRowsBase=1;
}
ImGui::EndTabItem();
}
ImGui::EndTabBar();
@ -1988,6 +2015,8 @@ void FurnaceGUI::syncSettings() {
settings.patFont=e->getConfInt("patFont",0);
settings.mainFontPath=e->getConfString("mainFontPath","");
settings.patFontPath=e->getConfString("patFontPath","");
settings.patRowsBase=e->getConfInt("patRowsBase",0);
settings.orderRowsBase=e->getConfInt("orderRowsBase",1);
}
void FurnaceGUI::commitSettings() {
@ -2003,6 +2032,8 @@ void FurnaceGUI::commitSettings() {
e->setConf("patFont",settings.patFont);
e->setConf("mainFontPath",settings.mainFontPath);
e->setConf("patFontPath",settings.patFontPath);
e->setConf("patRowsBase",settings.patRowsBase);
e->setConf("orderRowsBase",settings.orderRowsBase);
e->saveConf();

4
src/gui/gui.h
View File

@ -184,6 +184,8 @@ class FurnaceGUI {
int patFont;
int audioRate;
int audioBufSize;
int patRowsBase;
int orderRowsBase;
unsigned int maxUndoSteps;
String mainFontPath;
String patFontPath;
@ -199,6 +201,8 @@ class FurnaceGUI {
patFont(0),
audioRate(44100),
audioBufSize(1024),
patRowsBase(0),
orderRowsBase(1),
maxUndoSteps(100),
mainFontPath(""),
patFontPath("") {}