ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GUI: File selector usability improvements

This commit is contained in:
Jeffrey Pfau 2015-08-26 19:37:21 -07:00
parent 495c0ee54e
commit af24a98de4
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/util/gui/file-select.c
View File

@ -12,6 +12,9 @@
DECLARE_VECTOR(FileList, char*); DECLARE_VECTOR(FileList, char*);
DEFINE_VECTOR(FileList, char*); DEFINE_VECTOR(FileList, char*);
#define ITERATION_SIZE 5
#define SCANNING_THRESHOLD 20
static void _cleanFiles(struct FileList* currentFiles) { static void _cleanFiles(struct FileList* currentFiles) {
size_t size = FileListSize(currentFiles); size_t size = FileListSize(currentFiles);
size_t i; size_t i;
@ -37,7 +40,7 @@ static void _upDirectory(char* currentPath) {
// TODO: What if there was a trailing slash? // TODO: What if there was a trailing slash?
} }
static bool _refreshDirectory(const char* currentPath, struct FileList* currentFiles, bool (*filter)(struct VFile*)) { static bool _refreshDirectory(const struct GUIParams* params, const char* currentPath, struct FileList* currentFiles, bool (*filter)(struct VFile*)) {
_cleanFiles(currentFiles); _cleanFiles(currentFiles);
struct VDir* dir = VDirOpen(currentPath); struct VDir* dir = VDirOpen(currentPath);
@ -45,8 +48,16 @@ static bool _refreshDirectory(const char* currentPath, struct FileList* currentF
return false; return false;
} }
*FileListAppend(currentFiles) = "(Up)"; *FileListAppend(currentFiles) = "(Up)";
size_t i = 0;
struct VDirEntry* de; struct VDirEntry* de;
while ((de = dir->listNext(dir))) { while ((de = dir->listNext(dir))) {
++i;
if (i == SCANNING_THRESHOLD) {
params->drawStart();
GUIFontPrintf(params->font, 0, GUIFontHeight(params->font), GUI_TEXT_LEFT, 0xFFFFFFFF, "%s", currentPath);
GUIFontPrintf(params->font, 0, GUIFontHeight(params->font) * 2, GUI_TEXT_LEFT, 0xFFFFFFFF, "(scanning)");
params->drawEnd();
}
const char* name = de->name(de); const char* name = de->name(de);
if (name[0] == '.') { if (name[0] == '.') {
continue; continue;
@ -77,7 +88,7 @@ bool selectFile(const struct GUIParams* params, const char* basePath, char* outP
struct FileList currentFiles; struct FileList currentFiles;
FileListInit(&currentFiles, 0); FileListInit(&currentFiles, 0);
_refreshDirectory(currentPath, &currentFiles, filter); _refreshDirectory(params, currentPath, &currentFiles, filter);
int inputHistory[GUI_INPUT_MAX] = { 0 }; int inputHistory[GUI_INPUT_MAX] = { 0 };
@ -101,6 +112,21 @@ bool selectFile(const struct GUIParams* params, const char* basePath, char* outP
if (newInput & (1 << GUI_INPUT_DOWN) && fileIndex < FileListSize(&currentFiles) - 1) { if (newInput & (1 << GUI_INPUT_DOWN) && fileIndex < FileListSize(&currentFiles) - 1) {
++fileIndex; ++fileIndex;
} }
if (newInput & (1 << GUI_INPUT_LEFT)) {
if (fileIndex >= ITERATION_SIZE) {
fileIndex -= ITERATION_SIZE;
} else {
fileIndex = 0;
}
}
if (newInput & (1 << GUI_INPUT_RIGHT)) {
if (fileIndex + ITERATION_SIZE < FileListSize(&currentFiles)) {
fileIndex += ITERATION_SIZE;
} else {
fileIndex = FileListSize(&currentFiles) - 1;
}
}
if (fileIndex < start) { if (fileIndex < start) {
start = fileIndex; start = fileIndex;
} }
@ -115,7 +141,7 @@ bool selectFile(const struct GUIParams* params, const char* basePath, char* outP
if (newInput & (1 << GUI_INPUT_SELECT)) { if (newInput & (1 << GUI_INPUT_SELECT)) {
if (fileIndex == 0) { if (fileIndex == 0) {
_upDirectory(currentPath); _upDirectory(currentPath);
_refreshDirectory(currentPath, &currentFiles, filter); _refreshDirectory(params, currentPath, &currentFiles, filter);
} else { } else {
size_t len = strlen(currentPath); size_t len = strlen(currentPath);
const char* sep = PATH_SEP; const char* sep = PATH_SEP;
@ -123,7 +149,7 @@ bool selectFile(const struct GUIParams* params, const char* basePath, char* outP
sep = ""; sep = "";
} }
snprintf(outPath, outLen, "%s%s%s", currentPath, sep, *FileListGetPointer(&currentFiles, fileIndex)); snprintf(outPath, outLen, "%s%s%s", currentPath, sep, *FileListGetPointer(&currentFiles, fileIndex));
if (!_refreshDirectory(outPath, &currentFiles, filter)) { if (!_refreshDirectory(params, outPath, &currentFiles, filter)) {
return true; return true;
} }
strncpy(currentPath, outPath, outLen); strncpy(currentPath, outPath, outLen);
@ -137,13 +163,13 @@ bool selectFile(const struct GUIParams* params, const char* basePath, char* outP
return false; return false;
} }
_upDirectory(currentPath); _upDirectory(currentPath);
_refreshDirectory(currentPath, &currentFiles, filter); _refreshDirectory(params, currentPath, &currentFiles, filter);
fileIndex = 0; fileIndex = 0;
} }
params->drawStart(); params->drawStart();
int y = GUIFontHeight(params->font); int y = GUIFontHeight(params->font);
GUIFontPrintf(params->font, 0, y, GUI_TEXT_LEFT, 0xFFFFFFFF, "Current directory: %s", currentPath); GUIFontPrintf(params->font, 0, y, GUI_TEXT_LEFT, 0xFFFFFFFF, "%s", currentPath);
y += 2 * GUIFontHeight(params->font); y += 2 * GUIFontHeight(params->font);
size_t i; size_t i;
for (i = start; i < FileListSize(&currentFiles); ++i) { for (i = start; i < FileListSize(&currentFiles); ++i) {