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

Merge branch 'master' into inf2

Browse source
This commit is contained in:
tildearrow 2025-11-18 03:12:11 -05:00
commit 8f7fd0a229
8 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/editing.cpp
View file

@ -380,7 +380,7 @@ void FurnaceGUI::doDelete() {
for (; j<e->curSubSong->patLen && (j<=selEnd.y || jOrder<selEnd.order); j++) {
touch(jOrder,j);
if (iFine==0) {
if (selStart.y==selEnd.y && selStart.order==selEnd.order) pat->newData[j][DIV_PAT_VOL]=-1;
if (selStart.y==selEnd.y && selStart.order==selEnd.order) pat->newData[j][DIV_PAT_INS]=-1;
}
pat->newData[j][iFine]=-1;

4
src/gui/insEdit.cpp
View file

@ -2843,9 +2843,9 @@ void FurnaceGUI::drawMacros(std::vector<FurnaceGUIMacroDesc>& macros, FurnaceGUI
char buf[256];
if (macros[i].macro->len>0) {
snprintf(buf,255,"%s [%d]###%s",macros[i].displayName,macros[i].macro->len,macros[i].displayName);
snprintf(buf,255,"%s [%d]###%s_%d",macros[i].displayName,macros[i].macro->len,macros[i].displayName,(int)i);
} else {
snprintf(buf,255,"%s",macros[i].displayName);
snprintf(buf,255,"%s###%s_%d",macros[i].displayName,macros[i].displayName,(int)i);
}
if (ImGui::Selectable(buf,state.selectedMacro==(int)i)) {

7
src/gui/refPlayer.cpp
View file

@ -109,17 +109,20 @@ void FurnaceGUI::drawRefPlayer() {
if (ImGui::IsItemClicked(ImGuiMouseButton_Middle)) {
fp->setPos(0);
}
if (ImGui::IsItemClicked(ImGuiMouseButton_Right)) {
TimeMicros cueTime=e->getFilePlayerCue();
fpCueInput=cueTime.toString(-1,TA_TIME_FORMAT_AUTO);
}
if (ImGui::BeginPopupContextItem("Edit Cue Position",ImGuiPopupFlags_MouseButtonRight)) {
ImGui::TextUnformatted(_("Set cue position at first order:"));
TimeMicros cueTime=e->getFilePlayerCue();
bool altered=false;
fpCueInput=cueTime.toString(-1,TA_TIME_FORMAT_AUTO);
pushWarningColor(false,fpCueInputFailed);
if (ImGui::InputText("##CuePos",&fpCueInput)) {
fpCueInputFailed=false;
try {
cueTime=TimeMicros::fromString(fpCueInput);
altered=true;
fpCueInputFailed=false;
} catch (std::invalid_argument& e) {
fpCueInputFailed=true;
fpCueInputFailReason=e.what();

2
src/gui/settings.cpp
View file

@ -5116,7 +5116,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
settings.rackShowLEDs=conf.getInt("rackShowLEDs",1);
settings.mixerStyle=conf.getInt("mixerStyle",1);
settings.mixerLayout=conf.getInt("mixerLayout",1);
settings.mixerLayout=conf.getInt("mixerLayout",0);
settings.channelColors=conf.getInt("channelColors",1);
settings.channelTextColors=conf.getInt("channelTextColors",0);