From 8fb5b7b7115f9a00843e4da4ec54a5999fcb5f14 Mon Sep 17 00:00:00 2001 From: VoltZ <47382115+SuperSaiyajinVoltZ@users.noreply.github.com> Date: Fri, 22 Nov 2019 23:17:21 +0100 Subject: [PATCH] Add new bars and fix Text Positions for it. -> Bar Textures from Universal-Manager. Thanks TotallyNotGuy for the awesome Bar Textures! --- assets/gfx/sprites.t3s | 4 +++ assets/gfx/sprites/bottom_screen_bot.png | Bin 0 -> 2979 bytes assets/gfx/sprites/bottom_screen_top.png | Bin 0 -> 2923 bytes assets/gfx/sprites/top_screen_bot.png | Bin 0 -> 3545 bytes assets/gfx/sprites/top_screen_top.png | Bin 0 -> 3619 bytes include/screens/settings.hpp | 2 +- source/download/download.cpp | 2 +- source/gui.cpp | 38 ++++++++++++++--------- source/screens/ftpScreen.cpp | 2 +- source/screens/scriptBrowse.cpp | 11 +++---- source/screens/scriptlist.cpp | 4 +-- source/screens/settings.cpp | 10 +++--- source/screens/tinyDB.cpp | 19 ++++++++---- 13 files changed, 55 insertions(+), 37 deletions(-) create mode 100644 assets/gfx/sprites/bottom_screen_bot.png create mode 100644 assets/gfx/sprites/bottom_screen_top.png create mode 100644 assets/gfx/sprites/top_screen_bot.png create mode 100644 assets/gfx/sprites/top_screen_top.png diff --git a/assets/gfx/sprites.t3s b/assets/gfx/sprites.t3s index b025216..55e714e 100644 --- a/assets/gfx/sprites.t3s +++ b/assets/gfx/sprites.t3s @@ -1,5 +1,9 @@ --atlas -f rgba -z auto +sprites/bottom_screen_bot.png +sprites/bottom_screen_top.png +sprites/top_screen_bot.png +sprites/top_screen_top.png sprites/search.png sprites/credits/discord.png diff --git a/assets/gfx/sprites/bottom_screen_bot.png b/assets/gfx/sprites/bottom_screen_bot.png new file mode 100644 index 0000000000000000000000000000000000000000..961ea84961595618f721f35a5d522617a0c96b06 GIT binary patch literal 2979 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 Z{TF(jBTU-C08#(|002ovPDHLkV1mgUvkU+L literal 0 HcmV?d00001 diff --git a/assets/gfx/sprites/bottom_screen_top.png b/assets/gfx/sprites/bottom_screen_top.png new file mode 100644 index 0000000000000000000000000000000000000000..1520b3bc25b45601796139bb85d133583307296e GIT binary patch literal 2923 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 X0Tlo8l!8d+(rYfmMy|*5{{{FDl=v0M literal 0 HcmV?d00001 diff --git a/include/screens/settings.hpp b/include/screens/settings.hpp index 73d7cd0..42ab939 100644 --- a/include/screens/settings.hpp +++ b/include/screens/settings.hpp @@ -83,7 +83,7 @@ private: }; std::vector barPos = { - {0, 210, 320, 30, -1}, + {0, 215, 320, 25, -1}, }; }; diff --git a/source/download/download.cpp b/source/download/download.cpp index 2e43a01..3e0a903 100644 --- a/source/download/download.cpp +++ b/source/download/download.cpp @@ -701,7 +701,7 @@ void displayProgressBar() { C2D_TargetClear(top, BLACK); C2D_TargetClear(bottom, BLACK); Gui::DrawTop(); - Gui::DrawStringCentered(0, 2, 0.7f, Config::TxtColor, progressBarMsg, 400); + 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); diff --git a/source/gui.cpp b/source/gui.cpp index 6451f5f..620bdda 100644 --- a/source/gui.cpp +++ b/source/gui.cpp @@ -107,9 +107,9 @@ void Gui::DisplayWarnMsg(std::string Text) C2D_TargetClear(bottom, BLACK); Gui::DrawTop(); if (isScriptSelected == false) { - Gui::DrawStringCentered(0, 2, 0.6f, Config::TxtColor, Text, 400); + Gui::DrawStringCentered(0, 1, 0.6f, Config::TxtColor, Text, 400); } else if (isScriptSelected == true) { - Gui::DrawStringCentered(0, 2, 0.6f, TextColor, Text, 400); + Gui::DrawStringCentered(0, 1, 0.6f, TextColor, Text, 400); } Gui::DrawBottom(); C3D_FrameEnd(0); @@ -190,26 +190,34 @@ void Gui::ScreenDraw(C3D_RenderTarget * screen) void Gui::DrawTop(void) { Gui::ScreenDraw(top); if (isScriptSelected == false) { - Gui::Draw_Rect(0, 0, 400, 30, Config::Color1); - Gui::Draw_Rect(0, 30, 400, 180, Config::Color2); - Gui::Draw_Rect(0, 210, 400, 30, Config::Color1); + Gui::Draw_Rect(0, 0, 400, 25, Config::Color1); + Gui::Draw_Rect(0, 25, 400, 190, Config::Color2); + Gui::Draw_Rect(0, 215, 400, 25, Config::Color1); + Gui::sprite(sprites_top_screen_top_idx, 0, 0); + Gui::sprite(sprites_top_screen_bot_idx, 0, 215); } else if (isScriptSelected == true) { Gui::Draw_Rect(0, 0, 400, 30, barColor); - Gui::Draw_Rect(0, 30, 400, 180, bgTopColor); - Gui::Draw_Rect(0, 210, 400, 30, barColor); + Gui::Draw_Rect(0, 25, 400, 190, bgBottomColor); + Gui::Draw_Rect(0, 215, 400, 25, barColor); + Gui::sprite(sprites_top_screen_top_idx, 0, 0); + Gui::sprite(sprites_top_screen_bot_idx, 0, 215); } } void Gui::DrawBottom(void) { Gui::ScreenDraw(bottom); if (isScriptSelected == false) { - Gui::Draw_Rect(0, 0, 400, 30, Config::Color1); - Gui::Draw_Rect(0, 30, 400, 180, Config::Color3); - Gui::Draw_Rect(0, 210, 400, 30, Config::Color1); + Gui::Draw_Rect(0, 0, 320, 25, Config::Color1); + Gui::Draw_Rect(0, 25, 320, 190, Config::Color3); + Gui::Draw_Rect(0, 215, 320, 25, Config::Color1); + Gui::sprite(sprites_bottom_screen_top_idx, 0, 0); + Gui::sprite(sprites_bottom_screen_bot_idx, 0, 215); } else if (isScriptSelected == true) { - Gui::Draw_Rect(0, 0, 400, 30, barColor); - Gui::Draw_Rect(0, 30, 400, 180, bgBottomColor); - Gui::Draw_Rect(0, 210, 400, 30, barColor); + Gui::Draw_Rect(0, 0, 320, 30, barColor); + Gui::Draw_Rect(0, 25, 320, 190, bgBottomColor); + Gui::Draw_Rect(0, 215, 320, 25, barColor); + Gui::sprite(sprites_bottom_screen_top_idx, 0, 0); + Gui::sprite(sprites_bottom_screen_bot_idx, 0, 215); } } @@ -223,10 +231,10 @@ bool Gui::promptMsg(std::string promptMsg) Gui::DrawTop(); if (isScriptSelected == false) { Gui::DrawString((400-Gui::GetStringWidth(0.6f, promptMsg.c_str()))/2, 100, 0.6f, Config::TxtColor, promptMsg.c_str(), 400); - Gui::DrawString((400-Gui::GetStringWidth(0.72f, Lang::get("CONFIRM_OR_CANCEL")))/2, 214, 0.72f, Config::TxtColor, Lang::get("CONFIRM_OR_CANCEL"), 400); + Gui::DrawString((400-Gui::GetStringWidth(0.72f, Lang::get("CONFIRM_OR_CANCEL")))/2, 217, 0.72f, Config::TxtColor, Lang::get("CONFIRM_OR_CANCEL"), 400); } else if (isScriptSelected == true) { Gui::DrawString((400-Gui::GetStringWidth(0.6f, promptMsg.c_str()))/2, 100, 0.6f, TextColor, promptMsg.c_str(), 400); - Gui::DrawString((400-Gui::GetStringWidth(0.72f, Lang::get("CONFIRM_OR_CANCEL")))/2, 214, 0.72f, TextColor, Lang::get("CONFIRM_OR_CANCEL"), 400); + Gui::DrawString((400-Gui::GetStringWidth(0.72f, Lang::get("CONFIRM_OR_CANCEL")))/2, 217, 0.72f, TextColor, Lang::get("CONFIRM_OR_CANCEL"), 400); } Gui::DrawBottom(); C3D_FrameEnd(0); diff --git a/source/screens/ftpScreen.cpp b/source/screens/ftpScreen.cpp index ad8776e..dbe9478 100644 --- a/source/screens/ftpScreen.cpp +++ b/source/screens/ftpScreen.cpp @@ -52,7 +52,7 @@ void FTPScreen::Draw(void) const Gui::clearTextBufs(); C3D_FrameBegin(C3D_FRAME_SYNCDRAW); Gui::DrawTop(); - Gui::DrawString((400-Gui::GetStringWidth(0.8f, Lang::get("FTP_MODE")))/2, 2, 0.8f, Config::TxtColor, Lang::get("FTP_MODE"), 400); + Gui::DrawString((400-Gui::GetStringWidth(0.8f, Lang::get("FTP_MODE")))/2, 0, 0.8f, Config::TxtColor, Lang::get("FTP_MODE"), 400); Gui::DrawBottom(); ret = ACU_GetWifiStatus(&wifiStatus); diff --git a/source/screens/scriptBrowse.cpp b/source/screens/scriptBrowse.cpp index 7c6e36c..273911e 100644 --- a/source/screens/scriptBrowse.cpp +++ b/source/screens/scriptBrowse.cpp @@ -116,21 +116,20 @@ void ScriptBrowse::Draw(void) const { revision += std::to_string(int64_t(infoJson[selection]["revision"])); Gui::DrawString(397-Gui::GetStringWidth(0.6f, revision), 237-Gui::GetStringHeight(0.6f, revision), 0.6f, Config::TxtColor, revision); - Gui::DrawStringCentered(0, 3, 0.8f, Config::TxtColor, std::string(infoJson[selection]["title"]), 400); + Gui::DrawStringCentered(0, 0, 0.8f, Config::TxtColor, std::string(infoJson[selection]["title"]), 400); Gui::DrawStringCentered(0, 120, 0.6f, Config::TxtColor, std::string(infoJson[selection]["shortDesc"]), 400); if(infoJson[selection]["curRevision"] < infoJson[selection]["revision"]) { - Gui::DrawStringCentered(0, 215, 0.7f, Config::TxtColor, Lang::get("OUTDATED_SCRIPT"), 400); + Gui::DrawStringCentered(0, 217, 0.7f, Config::TxtColor, Lang::get("OUTDATED_SCRIPT"), 400); } else if(infoJson[selection]["curRevision"] == infoJson[selection]["revision"]) { - Gui::DrawStringCentered(0, 215, 0.7f, Config::TxtColor, Lang::get("UP-TO-DATE"), 400); + Gui::DrawStringCentered(0, 217, 0.7f, Config::TxtColor, Lang::get("UP-TO-DATE"), 400); } else if(infoJson[selection]["curRevision"] > infoJson[selection]["revision"]) { - Gui::DrawStringCentered(0, 215, 0.7f, Config::TxtColor, Lang::get("FUTURE_SCRIPT"), 400); + Gui::DrawStringCentered(0, 217, 0.7f, Config::TxtColor, Lang::get("FUTURE_SCRIPT"), 400); } Gui::DrawBottom(); - Gui::Draw_Rect(0, 0, 27, 30, WHITE); Gui::sprite(sprites_search_idx, -3, 0); Gui::DrawString(7.5, 1.5, 0.72f, BLACK, "\uE003"); - Gui::DrawString(317-Gui::GetStringWidth(0.6f, std::to_string(selection + 1) + " / " + maxScripts), 4, 0.6f, Config::TxtColor, std::to_string(selection + 1) + " / " + maxScripts); + Gui::DrawString(317-Gui::GetStringWidth(0.6f, std::to_string(selection + 1) + " / " + maxScripts), 3, 0.6f, Config::TxtColor, std::to_string(selection + 1) + " / " + maxScripts); if (Config::viewMode == 0) { for(int i=0;i