c64
/
pi1541
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'romname' into cleanup

This commit is contained in:
penfold42 2018-07-30 22:30:43 +10:00
parent 2f5914ec54 0ddf2a6e0a
commit 5f723f4139
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/FileBrowser.cpp
View File

@ -88,8 +88,8 @@ void FileBrowser::BrowsableListView::RefreshLine(u32 entryIndex, u32 x, u32 y, b
RGBA BkColour = RGBA(0, 0, 0, 0xFF); //palette[VIC2_COLOUR_INDEX_BLUE];
u32 columnsMax = columns;
if (columnsMax > sizeof(buffer1))
columnsMax = sizeof(buffer1);
if (columnsMax > sizeof(buffer1)-1)
columnsMax = sizeof(buffer1)-1;
if (entryIndex < list->entries.size())
{
@ -102,10 +102,17 @@ void FileBrowser::BrowsableListView::RefreshLine(u32 entryIndex, u32 x, u32 y, b
}
else
{
char ROstring[8] = { 0 };
if (entry->filImage.fattrib & AM_RDO)
strncpy (ROstring, "<", 8);
if (entry->caddyIndex != -1)
snprintf(buffer2, 256, "%d>%s", entry->caddyIndex, entry->filImage.fname);
snprintf(buffer2, 256, "%d>%s%s"
, entry->caddyIndex
, entry->filImage.fname
, ROstring
);
else
snprintf(buffer2, 256, "%s", entry->filImage.fname);
snprintf(buffer2, 256, "%s%s", entry->filImage.fname, ROstring);
}
}
else
@ -150,7 +157,7 @@ void FileBrowser::BrowsableListView::RefreshLine(u32 entryIndex, u32 x, u32 y, b
}
else
{
memset(buffer1, ' ', 80);
memset(buffer1, ' ', columnsMax);
screen->PrintText(false, x, y, buffer1, BkColour, BkColour);
}
}
@ -196,10 +203,17 @@ void FileBrowser::BrowsableListView::RefreshHighlightScroll()
}
else
{
char ROstring[8] = { 0 };
if (entry->filImage.fattrib & AM_RDO)
strncpy (ROstring, "<", 8);
if (entry->caddyIndex != -1)
snprintf(buffer2, 256, "%d>%s", entry->caddyIndex, entry->filImage.fname);
snprintf(buffer2, 256, "%d>%s%s"
, entry->caddyIndex
, entry->filImage.fname
, ROstring
);
else
snprintf(buffer2, 256, "%s", entry->filImage.fname);
snprintf(buffer2, 256, "%s%s", entry->filImage.fname, ROstring);
}
}
else