DarkStore-3DS/DarkStore
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/DarkStore.git synced 2026-07-03 00:39:02 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Also add Custom Themes to this branch.

Browse Source 
I mean, cause why not i guess. xD
This commit is contained in:
StackZ
2021-03-23 18:00:39 +01:00
committed by Pk11
parent 2b455c2dd0
commit aa58e23c13
32 changed files with 693 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/gfx.cpp
+11 -61
View File
@@ -29,68 +29,18 @@
#include "stringutils.hpp"
#include <ctime>
int GFX::SelectedTheme = 0;
/* All available Themes here inside that vector. */
std::vector<UITheme> GFX::Themes = {
/* Default Theme. */
{
C2D_Color32(50, 73, 98, 255), // Bar.
C2D_Color32(38, 44, 77, 255), // BG.
C2D_Color32(25, 30, 53, 255), // Bar Outline.
WHITE, // Text.
C2D_Color32(50, 73, 98, 255), // Entry bar.
C2D_Color32(25, 30, 53, 255), // Entry Outline.
C2D_Color32(28, 33, 58, 255), // Box Inside.
C2D_Color32(108, 130, 155, 255), // Box Outside.
BLACK, // Box Selected.
C2D_Color32(28, 33, 58, 255), // Progressbar Out.
C2D_Color32(77, 101, 128, 255), // Progressbar In.
C2D_Color32(51, 75, 102, 255), // Searchbar.
C2D_Color32(25, 30, 53, 255), // Searchbar Outline.
C2D_Color32(108, 130, 155, 255), // Sidebar Selected.
C2D_Color32(77, 101, 128, 255), // Sidebar Unselected.
C2D_Color32(77, 101, 128, 255), // Mark Selected.
C2D_Color32(28, 33, 58, 255), // Mark Unselected.
C2D_Color32(28, 33, 58, 255), // Downlist Preview (Top).
C2D_Color32(173, 204, 239, 255) // SideBar Icon Color.
},
/* Stack Theme. */
{
C2D_Color32(44, 48, 64, 255), // Bar.
C2D_Color32(52, 56, 64, 255), // BG.
C2D_Color32(22, 24, 32, 255), // Bar Outline.
C2D_Color32(216, 228, 228, 255), // Text.
C2D_Color32(60, 63, 113, 255), // Entry bar.
C2D_Color32(42, 46, 54, 255), // Entry Outline.
C2D_Color32(60, 63, 113, 255), // Box Inside.
C2D_Color32(42, 46, 54, 255), // Box Outside.
C2D_Color32(102, 105, 170, 255), // Box Selected.
C2D_Color32(42, 46, 54, 255), // Progressbar Out.
C2D_Color32(60, 63, 113, 255), // Progressbar In.
C2D_Color32(60, 63, 113, 255), // Searchbar.
C2D_Color32(42, 46, 54, 255), // Searchbar Outline.
C2D_Color32(60, 63, 113, 255), // Sidebar Selected.
C2D_Color32(42, 46, 54, 255), // Sidebar Unselected.
C2D_Color32(60, 63, 113, 255), // Mark Selected.
C2D_Color32(42, 46, 54, 255), // Mark Unselected.
C2D_Color32(52, 60, 76, 255), // Downlist Preview (Top).
C2D_Color32(102, 105, 170, 255) // SideBar Icon Color.
}
};
/* Draw the base top screen. */
void GFX::DrawTop(void) {
Gui::ScreenDraw(Top);
Gui::Draw_Rect(0, 0, 400, 25, GFX::Themes[GFX::SelectedTheme].BarColor);
Gui::Draw_Rect(0, 26, 400, 214, GFX::Themes[GFX::SelectedTheme].BGColor);
Gui::Draw_Rect(0, 25, 400, 1, GFX::Themes[GFX::SelectedTheme].BarOutline);
Gui::Draw_Rect(0, 0, 400, 25, UIThemes->BarColor());
Gui::Draw_Rect(0, 26, 400, 214, UIThemes->BGColor());
Gui::Draw_Rect(0, 25, 400, 1, UIThemes->BarOutline());
}
/* Draw the base bottom screen. */
void GFX::DrawBottom() {
Gui::ScreenDraw(Bottom);
Gui::Draw_Rect(0, 0, 320, 240, GFX::Themes[GFX::SelectedTheme].BGColor);
Gui::Draw_Rect(0, 0, 320, 240, UIThemes->BGColor());
}
/*
@@ -104,15 +54,15 @@ void GFX::DrawBottom() {
uint32_t clr: (Optional) The color of the inside of the box.
*/
void GFX::DrawBox(float xPos, float yPos, float width, float height, bool selected, uint32_t clr) {
Gui::Draw_Rect(xPos, yPos, width, height, GFX::Themes[GFX::SelectedTheme].BoxInside); // Draw middle BG.
Gui::Draw_Rect(xPos, yPos, width, height, UIThemes->BoxInside()); // Draw middle BG.
if (selected) {
static constexpr int depth = 3;
Gui::Draw_Rect(xPos - depth, yPos - depth, width + depth * 2, depth, GFX::Themes[GFX::SelectedTheme].BoxSelected); // Top.
Gui::Draw_Rect(xPos - depth, yPos - depth, depth, height + depth * 2, GFX::Themes[GFX::SelectedTheme].BoxSelected); // Left.
Gui::Draw_Rect(xPos + width, yPos - depth, depth, height + depth * 2, GFX::Themes[GFX::SelectedTheme].BoxSelected); // Right.
Gui::Draw_Rect(xPos - depth, yPos + height, width + depth * 2, depth, GFX::Themes[GFX::SelectedTheme].BoxSelected); // Bottom.
Gui::Draw_Rect(xPos - depth, yPos - depth, width + depth * 2, depth, UIThemes->BoxSelected()); // Top.
Gui::Draw_Rect(xPos - depth, yPos - depth, depth, height + depth * 2, UIThemes->BoxSelected()); // Left.
Gui::Draw_Rect(xPos + width, yPos - depth, depth, height + depth * 2, UIThemes->BoxSelected()); // Right.
Gui::Draw_Rect(xPos - depth, yPos + height, width + depth * 2, depth, UIThemes->BoxSelected()); // Bottom.
}
}
@@ -158,7 +108,7 @@ void GFX::DrawTime() {
struct tm *timeStruct = gmtime((const time_t *)&unixTime);
const std::string str = StringUtils::format("%02i:%02i", timeStruct->tm_hour, timeStruct->tm_min); // <Hour>:<Minute>.
Gui::DrawString(11, 5, 0.5f, GFX::Themes[GFX::SelectedTheme].TextColor, str, 0, 0, font);
Gui::DrawString(11, 5, 0.5f, UIThemes->TextColor(), str, 0, 0, font);
}
static int blinkDelay = 40;
@@ -228,7 +178,7 @@ void GFX::HandleBattery() {
*/
void GFX::DrawIcon(const int Idx, int X, int Y, float ScaleX, float ScaleY) {
C2D_ImageTint tint;
C2D_PlainImageTint(&tint, GFX::Themes[GFX::SelectedTheme].SideBarIconColor, 1.0f);
C2D_PlainImageTint(&tint, UIThemes->SideBarIconColor(), 1.0f);
C2D_DrawImageAt(C2D_SpriteSheetGetImage(sprites, Idx), X, Y, 0.5f, &tint, ScaleX, ScaleY);
}
source/gui/msg.cpp
+10 -10
View File
@@ -39,7 +39,7 @@ void Msg::DisplayMsg(const std::string &Text) {
C2D_TargetClear(Bottom, TRANSPARENT);
GFX::DrawTop();
Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, Text)) / 2, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, Text, 395, 0, font);
Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, Text)) / 2, 0.6f, UIThemes->TextColor(), Text, 395, 0, font);
GFX::DrawBottom();
C3D_FrameEnd(0);
}
@@ -56,7 +56,7 @@ void Msg::DisplayWarnMsg(const std::string &Text) {
C2D_TargetClear(Bottom, TRANSPARENT);
GFX::DrawTop();
Gui::DrawStringCentered(0, 1, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, Text, 390, 0, font);
Gui::DrawStringCentered(0, 1, 0.6f, UIThemes->TextColor(), Text, 390, 0, font);
GFX::DrawBottom();
C3D_FrameEnd(0);
@@ -78,11 +78,11 @@ bool Msg::promptMsg(const std::string &promptMsg) {
C2D_TargetClear(Bottom, TRANSPARENT);
GFX::DrawTop();
Gui::Draw_Rect(0, 215, 400, 25, GFX::Themes[GFX::SelectedTheme].BarColor);
Gui::Draw_Rect(0, 214, 400, 1, GFX::Themes[GFX::SelectedTheme].BarOutline);
Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, promptMsg)) / 2, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, promptMsg, 395, 0, font);
Gui::Draw_Rect(0, 215, 400, 25, UIThemes->BarColor());
Gui::Draw_Rect(0, 214, 400, 1, UIThemes->BarOutline());
Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, promptMsg)) / 2, 0.6f, UIThemes->TextColor(), promptMsg, 395, 0, font);
Gui::DrawStringCentered(0, 218, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, Lang::get("CONFIRM_OR_CANCEL"), 390, 0, font);
Gui::DrawStringCentered(0, 218, 0.6f, UIThemes->TextColor(), Lang::get("CONFIRM_OR_CANCEL"), 390, 0, font);
GFX::DrawBottom();
C3D_FrameEnd(0);
@@ -116,10 +116,10 @@ void Msg::waitMsg(const std::string &msg) {
C2D_TargetClear(Bottom, TRANSPARENT);
GFX::DrawTop();
Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, msg)) / 2, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, msg, 395, 0, font);
Gui::Draw_Rect(0, 215, 400, 25, GFX::Themes[GFX::SelectedTheme].BarColor);
Gui::Draw_Rect(0, 214, 400, 1, GFX::Themes[GFX::SelectedTheme].BarOutline);
Gui::DrawStringCentered(0, 218, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, Lang::get("KEY_CONTINUE"), 390, 0, font);
Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, msg)) / 2, 0.6f, UIThemes->TextColor(), msg, 395, 0, font);
Gui::Draw_Rect(0, 215, 400, 25, UIThemes->BarColor());
Gui::Draw_Rect(0, 214, 400, 1, UIThemes->BarOutline());
Gui::DrawStringCentered(0, 218, 0.6f, UIThemes->TextColor(), Lang::get("KEY_CONTINUE"), 390, 0, font);
GFX::DrawBottom();
C3D_FrameEnd(0);