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

fix export progress popup size

Browse source
This commit is contained in:
Eknous-P 2024-08-31 19:10:36 +04:00 committed by tildearrow
parent caa6f3091d
commit cf20905199
1 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/gui/gui.cpp
View file

@ -5854,6 +5854,7 @@ bool FurnaceGUI::loop() {
MEASURE_BEGIN(popup); MEASURE_BEGIN(popup);
centerNextWindow(_("Rendering..."),canvasW,canvasH); centerNextWindow(_("Rendering..."),canvasW,canvasH);
ImGui::SetNextWindowSize(ImVec2(0.0f,0.0f));
if (ImGui::BeginPopupModal(_("Rendering..."),NULL,ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoMove)) { if (ImGui::BeginPopupModal(_("Rendering..."),NULL,ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoMove)) {
// WHAT the HELL?! // WHAT the HELL?!
WAKE_UP; WAKE_UP;
@ -5870,35 +5871,32 @@ bool FurnaceGUI::loop() {
int curFile=0; int curFile=0;
int* curFileLambda=&curFile; int* curFileLambda=&curFile;
if (e->isExporting()) { if (e->isExporting()) {
e->lockEngine([this, progressLambda, curPosInRowsLambda, curFileLambda, e->lockEngine(
loopsLeftLambda, totalLoopsLambda] () { [this, progressLambda, curPosInRowsLambda, curFileLambda, loopsLeftLambda, totalLoopsLambda] () {
int curRow=0; int curOrder=0; int curRow=0; int curOrder=0;
e->getCurSongPos(curRow, curOrder); *curFileLambda=0; e->getCurSongPos(curRow, curOrder);
*curFileLambda=0;
e->getCurFileIndex(*curFileLambda); e->getCurFileIndex(*curFileLambda);
*curPosInRowsLambda=curRow; for (int i=0; i<curOrder; *curPosInRowsLambda=curRow;
i++) { for (int i=0; i<curOrder; i++) *curPosInRowsLambda+=songOrdersLengths[i];
*curPosInRowsLambda+=songOrdersLengths[i];}
if (!songHasSongEndCommand) { if (!songHasSongEndCommand) {
e->getLoopsLeft(*loopsLeftLambda); e->getTotalLoops(*totalLoopsLambda); if ((*totalLoopsLambda)!=(*loopsLeftLambda)) //we are going 2nd, 3rd, etc. time through the song e->getLoopsLeft(*loopsLeftLambda);
{ e->getTotalLoops(*totalLoopsLambda);
if ((*totalLoopsLambda)!=(*loopsLeftLambda)) { // we are going 2nd, 3rd, etc. time through the song
*curPosInRowsLambda-=(songLength-songLoopedSectionLength); // a hack so progress bar does not jump? *curPosInRowsLambda-=(songLength-songLoopedSectionLength); // a hack so progress bar does not jump?
} }
if (e->getIsFadingOut()) //we are in fadeout??? why it works like that bruh if (e->getIsFadingOut()) { // we are in fadeout??? why it works like that bruh
{
// LIVE WITH IT damn it // LIVE WITH IT damn it
*curPosInRowsLambda-=(songLength-songLoopedSectionLength); // a hack so progress bar does not jump? *curPosInRowsLambda-=(songLength-songLoopedSectionLength); // a hack so progress bar does not jump?
} }
} }
// this horrible indentation courtesy of `indent` *progressLambda=(float)((*curPosInRowsLambda)+((*totalLoopsLambda)-(*loopsLeftLambda))*songLength+lengthOfOneFile*(*curFileLambda))/(float)totalLength;
*progressLambda=(float) ((*curPosInRowsLambda) + ((*totalLoopsLambda)- (*loopsLeftLambda)) * songLength + lengthOfOneFile * (*curFileLambda)) / (float) totalLength;}); }
);
} }
ImGui::Text(_("Row %d of %d"),curPosInRows+((totalLoops)-(loopsLeft))*songLength,lengthOfOneFile); ImGui::Text(_("Row %d of %d"),curPosInRows+((totalLoops)-(loopsLeft))*songLength,lengthOfOneFile);
if (audioExportOptions.mode==DIV_EXPORT_MODE_MANY_CHAN) ImGui::Text(_("Channel %d of %d"),curFile+1,totalFiles);
if (audioExportOptions.mode==DIV_EXPORT_MODE_MANY_CHAN) {
ImGui::Text(_("Channel %d of %d"),curFile+1,totalFiles);
}
ImGui::ProgressBar(curProgress,ImVec2(320.0f*dpiScale,0),fmt::sprintf("%.2f%%",curProgress*100.0f).c_str()); ImGui::ProgressBar(curProgress,ImVec2(320.0f*dpiScale,0),fmt::sprintf("%.2f%%",curProgress*100.0f).c_str());