Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-10-01 13:46:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Long path wrap fix

Browse Source
This commit is contained in:
J-D-K
2018-06-24 01:11:14 -04:00
parent 697ac050df
commit d5e32133b2
4 changed files with 72 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -38,7 +38,7 @@ INCLUDES := inc
EXEFS_SRC := exefs_src
APP_TITLE := JKSV
APP_AUTHOR := JK_
APP_VERSION := 06/22/2018
APP_VERSION := 06/24/2018
ROMFS := romfs
#---------------------------------------------------------------------------------

30
src/file.cpp
View File

@@ -275,24 +275,24 @@ namespace fs
std::string getFileProps(const std::string& _path)
{
std::string ret = "";
std::fstream get(_path, std::ios::in | std::ios::binary);
if(get.is_open())
{
//Size
get.seekg(0, get.end);
unsigned fileSize = get.tellg();
get.seekg(0, get.beg);
std::string ret = "";
std::fstream get(_path, std::ios::in | std::ios::binary);
if(get.is_open())
{
//Size
get.seekg(0, get.end);
unsigned fileSize = get.tellg();
get.seekg(0, get.beg);
get.close();
get.close();
//Probably add more later
//Probably add more later
char tmp[256];
std::sprintf(tmp, "Path: \"%s\"\nSize: %u", _path.c_str(), fileSize);
char tmp[256];
std::sprintf(tmp, "Path: \"%s\"\nSize: %u", _path.c_str(), fileSize);
ret = tmp;
}
return ret;
ret = tmp;
}
return ret;
}
}

91
src/ui.cpp
View File

@@ -33,7 +33,7 @@ static ui::menu userMenu, titleMenu, folderMenu, devMenu, saveMenu, sdMenu, copy
static gfx::tex buttonA, buttonB, buttonX, buttonY, titleBar;
static const std::string sysSaveMess = "No system saves until we get public NAND restore.";
static std::string savePath, sdPath;
static std::string savePath, sdPath, saveWrap, sdWrap;
static fs::dirList saveList(""), sdList("sdmc:/");
static int advMenuCtrl = 0, advPrev = 0;
@@ -570,7 +570,7 @@ namespace ui
void drawUI()
{
gfx::clearBufferColor(clearClr);
ui::drawTitleBar("JKSV - 06/22/2018");
ui::drawTitleBar("JKSV - 06/24/2018");
switch(mstate)
{
@@ -649,8 +649,8 @@ namespace ui
saveMenu.print(16, 88, mnuTxt, 616);
sdMenu.print(648, 88, mnuTxt, 616);
gfx::drawText(util::getWrappedString(savePath, 32, 600), 16, 652, 32, mnuTxt);
gfx::drawText(util::getWrappedString(sdPath, 32, 600), 656, 652, 32, mnuTxt);
gfx::drawText(saveWrap, 16, 652, 32, mnuTxt);
gfx::drawText(sdWrap, 656, 652, 32, mnuTxt);
break;
}
}
@@ -819,6 +819,9 @@ namespace ui
savePath = "sv:/";
sdPath = "sdmc:/";
saveWrap = "sv:/";
sdWrap = "sdmc:/";
saveList.reassign(savePath);
sdList.reassign(sdPath);
@@ -968,7 +971,7 @@ namespace ui
case 1:
if(sdMenu.getSelected() == 0)
{
if(confirmDelete(sdPath))
if(confirmDelete(sdPath) && sdPath != "sdmc:/")
fs::delDir(sdPath);
}
else if(sdMenu.getSelected() > 1)
@@ -1075,40 +1078,40 @@ namespace ui
}
break;
//Props
case 4:
{
switch(advPrev)
{
//sv
case 0:
{
if(saveMenu.getSelected() > 1)
{
int sel = saveMenu.getSelected() - 2;
std::string fullPath = savePath + saveList.getItem(sel);
std::string props = fs::getFileProps(fullPath);
if(!props.empty())
showMessage(props);
}
}
break;
//Props
case 4:
{
switch(advPrev)
{
//sv
case 0:
{
if(saveMenu.getSelected() > 1)
{
int sel = saveMenu.getSelected() - 2;
std::string fullPath = savePath + saveList.getItem(sel);
std::string props = fs::getFileProps(fullPath);
if(!props.empty())
showMessage(props);
}
}
break;
case 1:
{
if(sdMenu.getSelected() > 1)
{
int sel = sdMenu.getSelected() - 2;
std::string fullPath = sdPath + sdList.getItem(sel);
std::string props = fs::getFileProps(fullPath);
if(!props.empty())
showMessage(props);
}
}
break;
}
}
break;
case 1:
{
if(sdMenu.getSelected() > 1)
{
int sel = sdMenu.getSelected() - 2;
std::string fullPath = sdPath + sdList.getItem(sel);
std::string props = fs::getFileProps(fullPath);
if(!props.empty())
showMessage(props);
}
}
break;
}
}
break;
//back
case 5:
@@ -1154,12 +1157,16 @@ namespace ui
if(saveSel == 1 && savePath != "sv:/")
{
util::removeLastFolderFromString(savePath);
saveWrap = util::getWrappedString(savePath, 32, 600);
saveList.reassign(savePath);
util::copyDirListToMenu(saveList, saveMenu);
}
else if(saveSel > 1 && saveList.isDir(saveSel - 2))
{
savePath += saveList.getItem(saveSel - 2) + "/";
saveWrap = util::getWrappedString(savePath, 32, 600);
saveList.reassign(savePath);
util::copyDirListToMenu(saveList, saveMenu);
}
@@ -1173,12 +1180,16 @@ namespace ui
if(sdSel == 1 && sdPath != "sdmc:/")
{
util::removeLastFolderFromString(sdPath);
sdWrap = util::getWrappedString(sdPath, 32, 600);
sdList.reassign(sdPath);
util::copyDirListToMenu(sdList, sdMenu);
}
else if(sdSel > 1 && sdList.isDir(sdSel - 2))
{
sdPath += sdList.getItem(sdSel - 2) + "/";
sdWrap = util::getWrappedString(sdPath, 32, 600);
sdList.reassign(sdPath);
util::copyDirListToMenu(sdList, sdMenu);
}
@@ -1197,6 +1208,8 @@ namespace ui
if(advMenuCtrl == 0 && savePath != "sv:/")
{
util::removeLastFolderFromString(savePath);
saveWrap = util::getWrappedString(savePath, 32, 600);
saveList.reassign(savePath);
util::copyDirListToMenu(saveList, saveMenu);
}
@@ -1204,6 +1217,8 @@ namespace ui
else if(advMenuCtrl == 1 && sdPath != "sdmc:/")
{
util::removeLastFolderFromString(sdPath);
sdWrap = util::getWrappedString(sdPath, 32, 600);
sdList.reassign(sdPath);
util::copyDirListToMenu(sdList, sdMenu);
}

5
src/util.cpp
View File

@@ -43,13 +43,14 @@ namespace util
return s;
std::string ret = "", tmp = "";
unsigned first = 0, lastSpace = 0;
unsigned first = 0, lastSpace = 0, chkNoSpc = 0;
for(unsigned i = 0; i < s.length(); i++)
{
tmp += s[i];
if(s[i] == ' ')
// slash for really long file paths with no spaces.
if(s[i] == ' ' || s[i] == '/')
lastSpace = i;
if(gfx::getTextWidth(tmp, sz) >= maxWidth)