Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-04-26 01:59:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix missing button prompts

Browse Source
This commit is contained in:
J-D-K 2020-05-15 13:54:16 -04:00
parent 8ccba85d7c
commit 197b0b0c67
8 changed files with 70 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/miscui.h
View File

@ -48,8 +48,8 @@ namespace ui
bool confirm(bool hold, const char *fmt, ...);
bool confirmTransfer(const std::string& f, const std::string& t);
bool confirmDelete(const std::string& p);
void drawTextbox(int x, int y, int w, int h);
void drawTextboxInvert(int x, int y, int w, int h);
void drawTextbox(tex *target, int x, int y, int w, int h);
void drawTextboxInvert(tex *target, int x, int y, int w, int h);
//Popup from freebird
void showPopup(const std::string& mess, unsigned frames);

4
inc/ui.h
View File

@ -52,9 +52,9 @@ namespace ui
//Textbox graphics
extern tex *cornerTopLeft, *cornerTopRight, *cornerBottomLeft, *cornerBottomRight;
//Covers left and right of progress bar to fake being not a rectangle.
extern tex *progCovLeft, *progCovRight;
extern tex *progCovLeft, *progCovRight, *diaBox;
//Side bar from Freebird. RIP
//Side bar from Freebird. RIP. NEVERMIND
extern tex *sideBar;
//Shared font

2
src/gfx.c
View File

@ -10,7 +10,7 @@
#include "gfx.h"
tex *frameBuffer;
clr textClr;
static clr textClr;
static NWindow *window;
static Framebuffer fb;

11
src/ui.cpp
View File

@ -78,7 +78,7 @@ namespace ui
//textbox pieces
//I was going to flip them when I draw them, but then laziness kicked in.
tex *cornerTopLeft, *cornerTopRight, *cornerBottomLeft, *cornerBottomRight;
tex *progCovLeft, *progCovRight;
tex *progCovLeft, *progCovRight, *diaBox;
//Menu box pieces
tex *mnuTopLeft, *mnuTopRight, *mnuBotLeft, *mnuBotRight;
@ -161,6 +161,7 @@ namespace ui
top = texCreate(1280, 88);
bot = texCreate(1280, 72);
diaBox = texCreate(640, 420);
if(fs::fileExists(fs::getWorkDir() + "cls.txt"))
{
@ -186,6 +187,10 @@ namespace ui
//Not needed anymore
texDestroy(icn);
//Setup dialog box
drawTextbox(diaBox, 0, 0, 640, 420);
drawRect(diaBox, 0, 56, 640, 2, ui::thmID == ColorSetId_Light ? clrCreateU32(0xFF6D6D6D) : clrCreateU32(0xFFCCCCCC));
util::replaceButtonsInString(userHelp);
util::replaceButtonsInString(titleHelp);
util::replaceButtonsInString(folderHelp);
@ -239,6 +244,10 @@ namespace ui
texDestroy(fldrGuide);
texDestroy(optGuide);
texDestroy(top);
texDestroy(bot);
texDestroy(diaBox);
fontDestroy(shared);
}

4
src/ui/advmode.cpp
View File

@ -516,14 +516,14 @@ namespace ui
case 0:
copyMenu.setParams(176, 278, 304);
copyMenu.editOpt(0, "Copy to SD");
ui::drawTextbox(168, 236, 320, 268);
ui::drawTextbox(frameBuffer, 168, 236, 320, 268);
drawText("SAVE", frameBuffer, ui::shared, 176, 250, 18,txtClr);
break;
case 1:
copyMenu.setParams(816, 278, 304);
copyMenu.editOpt(0, "Copy to Save");
ui::drawTextbox(808, 236, 320, 268);
ui::drawTextbox(frameBuffer, 808, 236, 320, 268);
drawText("SDMC", frameBuffer, ui::shared, 816, 250, 18, txtClr);
break;
}

90
src/ui/miscui.cpp
View File

@ -9,6 +9,7 @@
static bool popDraw = false;
static std::string popText;
static const char *yt = "Yes \ue0e0", *nt = "No \ue0e1", *okt = "OK \ue0e0";
static unsigned popY, popX, popWidth, popState, frameCount, frameHold;
enum popStates
@ -39,7 +40,7 @@ namespace ui
size_t headWidth = textGetWidth(head.c_str(), ui::shared, 20);
unsigned headX = (1280 / 2) - (headWidth / 2);
ui::drawTextbox(320, 150, 640, 420);
texDraw(diaBox, frameBuffer, 320, 150);
drawRect(frameBuffer, 320, 206, 640, 2, ui::thmID == ColorSetId_Light ? clrCreateU32(0xFF6D6D6D) : clrCreateU32(0xFFCCCCCC));
drawRect(frameBuffer, 352, 530, 576, 12, clrCreateU32(0xFF666666));
drawRect(frameBuffer, 352, 530, (unsigned)width, 12, ui::thmID == ColorSetId_Light ? clrCreateU32(0xFFC5FF00) : clrCreateU32(0xFFF05032));
@ -52,14 +53,16 @@ namespace ui
void showMessage(const char *head, const char *fmt, ...)
{
//fake focus
drawRectAlpha(frameBuffer, 0, 0, 1280, 720, clrCreateU32(0xAA0D0D0D));
char tmp[512];
va_list args;
va_start(args, fmt);
vsprintf(tmp, fmt, args);
//center head text width
size_t headWidth = textGetWidth(head, ui::shared, 20);
unsigned headX = (1280 / 2) - (headWidth / 2);
unsigned headX = (640 / 2) - (textGetWidth(head, ui::shared, 20) / 2);
unsigned okX = (640 / 2) - (textGetWidth(okt, ui::shared, 20) / 2);
while(true)
{
@ -71,16 +74,19 @@ namespace ui
break;
gfxBeginFrame();
ui::drawTextbox(320, 150, 640, 420);
drawText(head, frameBuffer, ui::shared, headX, 168, 20, txtClr);
drawRect(frameBuffer, 320, 206, 640, 2, ui::thmID == ColorSetId_Light ? clrCreateU32(0xFF6D6D6D) : clrCreateU32(0xFFCCCCCC));
drawTextWrap(tmp, frameBuffer, ui::shared, 352, 230, 16, txtClr, 576);
texDraw(diaBox, frameBuffer, 320, 150);
drawText(head, frameBuffer, ui::shared, 320 + headX, 168, 20, ui::txtClr);
drawTextWrap(tmp, frameBuffer, ui::shared, 352, 230, 16, ui::txtClr, 576);
drawText(okt, frameBuffer, ui::shared, 320 + okX, 530, 20, ui::txtClr);
gfxEndFrame();
}
}
bool confirm(bool hold, const char *fmt, ...)
{
//fake focus
drawRectAlpha(frameBuffer, 0, 0, 1280, 720, clrCreateU32(0xAA0D0D0D));
char tmp[512];
va_list args;
va_start(args, fmt);
@ -89,11 +95,13 @@ namespace ui
bool ret = false, heldDown = false;
unsigned loadFrame = 0, holdCount = 0;
uint8_t holdClrDiff = 0;
clr holdClr;
clr holdClr = ui::txtClr;
size_t headWidth = textGetWidth("Confirm", ui::shared, 20);
unsigned headX = (1280 / 2) - (headWidth / 2);
unsigned headX = (640 / 2) - (textGetWidth("Confirm", ui::shared, 20) / 2);
unsigned yesX = 160 - (textGetWidth(yt, ui::shared, 20) / 2);
unsigned noX = 160 - (textGetWidth(nt, ui::shared, 20) / 2);
std::string yesText = yt;
while(true)
{
@ -102,8 +110,6 @@ namespace ui
uint64_t down = hidKeysDown(CONTROLLER_P1_AUTO);
uint64_t held = hidKeysHeld(CONTROLLER_P1_AUTO);
std::string holdText;
if(hold && held & KEY_A)
{
heldDown = true;
@ -122,19 +128,23 @@ namespace ui
}
if(holdCount <= 40)
holdText = "(Hold) ";
yesText = "(Hold) ";
else if(holdCount <= 80)
holdText = "(Keep Holding) ";
yesText = "(Keep Holding) ";
else if(holdCount < 120)
holdText = "(Almost There!) ";
yesText = "(Almost There!) ";
holdText += loadGlyphArray[loadFrame];
yesText += loadGlyphArray[loadFrame];
yesX = 160 - (textGetWidth(yesText.c_str(), ui::shared, 20) / 2);
}
else if(hold && heldDown)
{
//Reset everything
heldDown= false;
holdCount = 0, loadFrame = 0, holdClrDiff = 0;
yesX = 160 - (textGetWidth(yt, ui::shared, 20) / 2);
yesText = yt;
holdClr = ui::txtClr;
}
else if(down & KEY_A)
{
@ -147,11 +157,6 @@ namespace ui
break;
}
gfxBeginFrame();
ui::drawTextbox(320, 150, 640, 420);
drawText("Confirm", frameBuffer, ui::shared, headX, 168, 20, txtClr);
drawRect(frameBuffer, 320, 206, 640, 2, ui::thmID == ColorSetId_Light ? clrCreateU32(0xFF6D6D6D) : clrCreateU32(0xFFCCCCCC));
drawTextWrap(tmp, frameBuffer, ui::shared, 352, 230, 16, txtClr, 576);
if(hold && heldDown)
{
if(ui::thmID == ColorSetId_Light)
@ -159,6 +164,13 @@ namespace ui
else
holdClr = clrCreateRGBA(0x25 + holdClrDiff, 0x00, 0x00, 0xFF);
}
gfxBeginFrame();
texDraw(diaBox, frameBuffer, 320, 150);
drawText("Confirm", frameBuffer, ui::shared, 320 + headX, 168, 20, ui::txtClr);
drawText(yesText.c_str(), frameBuffer, ui::shared, 320 + yesX, 530, 20, holdClr);
drawText(nt, frameBuffer, ui::shared, 860 - noX, 530, 20, ui::txtClr);
drawTextWrap(tmp, frameBuffer, ui::shared, 352, 230, 16, ui::txtClr, 576);
gfxEndFrame();
}
@ -175,40 +187,40 @@ namespace ui
return confirm(data::holdDel, ui::confDel.c_str(), p.c_str());
}
void drawTextbox(int x, int y, int w, int h)
void drawTextbox(tex *target, int x, int y, int w, int h)
{
//Top
texDraw(ui::cornerTopLeft, frameBuffer, x, y);
drawRect(frameBuffer, x + 32, y, w - 64, 32, ui::tboxClr);
texDraw(ui::cornerTopRight, frameBuffer, (x + w) - 32, y);
texDraw(ui::cornerTopLeft, target, x, y);
drawRect(target, x + 32, y, w - 64, 32, ui::tboxClr);
texDraw(ui::cornerTopRight, target, (x + w) - 32, y);
//middle
drawRect(frameBuffer, x, y + 32, w, h - 64, tboxClr);
drawRect(target, x, y + 32, w, h - 64, tboxClr);
//bottom
texDraw(ui::cornerBottomLeft, frameBuffer, x, (y + h) - 32);
drawRect(frameBuffer, x + 32, (y + h) - 32, w - 64, 32, tboxClr);
texDraw(ui::cornerBottomRight, frameBuffer, (x + w) - 32, (y + h) - 32);
texDraw(ui::cornerBottomLeft, target, x, (y + h) - 32);
drawRect(target, x + 32, (y + h) - 32, w - 64, 32, tboxClr);
texDraw(ui::cornerBottomRight, target, (x + w) - 32, (y + h) - 32);
}
void drawTextboxInvert(int x, int y, int w, int h)
void drawTextboxInvert(tex *target, int x, int y, int w, int h)
{
clr temp = ui::tboxClr;
clrInvert(&temp);
//Top
texDrawInvert(ui::cornerTopLeft, frameBuffer, x, y);
drawRect(frameBuffer, x + 32, y, w - 64, 32, temp);
texDrawInvert(ui::cornerTopRight, frameBuffer, (x + w) - 32, y);
texDrawInvert(ui::cornerTopLeft, target, x, y);
drawRect(target, x + 32, y, w - 64, 32, temp);
texDrawInvert(ui::cornerTopRight, target, (x + w) - 32, y);
//middle
drawRect(frameBuffer, x, y + 32, w, h - 64, temp);
drawRect(target, x, y + 32, w, h - 64, temp);
//bottom
texDrawInvert(ui::cornerBottomLeft, frameBuffer, x, (y + h) - 32);
drawRect(frameBuffer, x + 32, (y + h) - 32, w - 64, 32, temp);
texDrawInvert(ui::cornerBottomRight, frameBuffer, (x + w) - 32, (y + h) - 32);
texDrawInvert(ui::cornerBottomLeft, target, x, (y + h) - 32);
drawRect(target, x + 32, (y + h) - 32, w - 64, 32, temp);
texDrawInvert(ui::cornerBottomRight, target, (x + w) - 32, (y + h) - 32);
}
void showPopup(const std::string& mess, unsigned frames)
@ -251,7 +263,7 @@ namespace ui
break;
}
drawTextbox(popX, popY, popWidth, 64);
drawTextbox(frameBuffer, popX, popY, popWidth, 64);
drawText(popText.c_str(), frameBuffer, ui::shared, popX + 16, popY + 20, 24, ui::txtClr);
}
}

2
src/ui/ttlsel.cpp
View File

@ -67,7 +67,7 @@ namespace ui
if(rectX + rectWidth > 1264)
rectX = 1264 - rectWidth;
drawTextbox(rectX, y - 50, rectWidth, 38);
drawTextbox(frameBuffer, rectX, y - 50, rectWidth, 38);
drawText(title.c_str(), frameBuffer, ui::shared, rectX + 16, y - 38, 16, txtClr);
}

2
src/ui/usrsel.cpp
View File

@ -61,7 +61,7 @@ namespace ui
if(userRectX + userRectWidth > 1264)
userRectX = 1264 - userRectWidth;
drawTextbox(userRectX, y - 50, userRectWidth, 38);
drawTextbox(frameBuffer, userRectX, y - 50, userRectWidth, 38);
drawText(username.c_str(), frameBuffer, ui::shared, userRectX + 16, y - 38, 16, txtClr);
}
data::users[i].drawIconHalf(tX, y);