From 9e87033aff6f8ae68ac2f48fd1546c7c51cceebb Mon Sep 17 00:00:00 2001 From: SuperSaiyajinStackZ <47382115+SuperSaiyajinStackZ@users.noreply.github.com> Date: Sun, 22 Dec 2019 03:25:12 +0100 Subject: [PATCH] Change the way, how the extract progress looks. --- source/download/download.cpp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/source/download/download.cpp b/source/download/download.cpp index d0b0f80..103956b 100644 --- a/source/download/download.cpp +++ b/source/download/download.cpp @@ -679,12 +679,21 @@ void displayProgressBar() { Gui::DrawTop(); Gui::DrawStringCentered(0, 1, 0.7f, Config::TxtColor, progressBarMsg, 400); - Gui::DrawStringCentered(0, 80, 0.6f, Config::TxtColor, str, 400); - Gui::Draw_Rect(30, 120, 340, 30, BLACK); - if (isScriptSelected == true) { - Gui::Draw_Rect(31, 121, (int)(((float)downloadNow/(float)downloadTotal) * 338.0f), 28, progressBar); - } else { - Gui::Draw_Rect(31, 121, (int)(((float)downloadNow/(float)downloadTotal) * 338.0f), 28, Config::progressbarColor); + // Display 'Currently Extracting: '. + if (progressBarType == 1) { + Gui::DrawStringCentered(0, 140, 0.6f, Config::TxtColor, str, 400); + Gui::DrawStringCentered(0, 60, 0.6f, Config::TxtColor, Lang::get("CURRENTLY_EXTRACTING") + extractingFile, 400); + } + + // Only display this by downloading. + if (progressBarType == 0) { + Gui::DrawStringCentered(0, 80, 0.6f, Config::TxtColor, str, 400); + Gui::Draw_Rect(30, 120, 340, 30, BLACK); + if (isScriptSelected == true) { + Gui::Draw_Rect(31, 121, (int)(((float)downloadNow/(float)downloadTotal) * 338.0f), 28, progressBar); + } else { + Gui::Draw_Rect(31, 121, (int)(((float)downloadNow/(float)downloadTotal) * 338.0f), 28, Config::progressbarColor); + } } Gui::DrawBottom(); C3D_FrameEnd(0);