AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-18 12:05:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix software column remaining cutoff even at larger window resolution

Browse Source
This commit is contained in:
UnknownShadow200 2021-06-02 20:05:50 +10:00
parent 185f560190
commit fe9c21d381
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/LWidgets.c
View File

@ -733,27 +733,27 @@ void LSlider_Init(struct LScreen* s, struct LSlider* w, int width, int height, B
/*########################################################################################################################* /*########################################################################################################################*
*------------------------------------------------------TableWidget--------------------------------------------------------* *------------------------------------------------------TableWidget--------------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
static void FlagColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, int x, int y) { static void FlagColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, struct LTableCell* cell) {
struct Bitmap* bmp = Flags_Get(row); struct Bitmap* bmp = Flags_Get(row);
if (!bmp) return; if (!bmp) return;
Drawer2D_BmpCopy(&Launcher_Framebuffer, x + flagXOffset, y + flagYOffset, bmp); Drawer2D_BmpCopy(&Launcher_Framebuffer, cell->x + flagXOffset, cell->y + flagYOffset, bmp);
} }
static void NameColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, int x, int y) { static void NameColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, struct LTableCell* cell) {
args->text = row->name; args->text = row->name;
} }
static int NameColumn_Sort(const struct ServerInfo* a, const struct ServerInfo* b) { static int NameColumn_Sort(const struct ServerInfo* a, const struct ServerInfo* b) {
return String_Compare(&b->name, &a->name); return String_Compare(&b->name, &a->name);
} }
static void PlayersColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, int x, int y) { static void PlayersColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, struct LTableCell* cell) {
String_Format2(&args->text, "%i/%i", &row->players, &row->maxPlayers); String_Format2(&args->text, "%i/%i", &row->players, &row->maxPlayers);
} }
static int PlayersColumn_Sort(const struct ServerInfo* a, const struct ServerInfo* b) { static int PlayersColumn_Sort(const struct ServerInfo* a, const struct ServerInfo* b) {
return b->players - a->players; return b->players - a->players;
} }
static void UptimeColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, int x, int y) { static void UptimeColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, struct LTableCell* cell) {
int uptime = row->uptime; int uptime = row->uptime;
char unit = 's'; char unit = 's';
@ -770,8 +770,11 @@ static int UptimeColumn_Sort(const struct ServerInfo* a, const struct ServerInfo
return b->uptime - a->uptime; return b->uptime - a->uptime;
} }
static void SoftwareColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, int x, int y) { static void SoftwareColumn_Draw(struct ServerInfo* row, struct DrawTextArgs* args, struct LTableCell* cell) {
args->text = row->software; /* last column, so adjust to fit size of table */
int leftover = cell->table->width - cell->x;
cell->width = max(cell->width, leftover);
args->text = row->software;
} }
static int SoftwareColumn_Sort(const struct ServerInfo* a, const struct ServerInfo* b) { static int SoftwareColumn_Sort(const struct ServerInfo* a, const struct ServerInfo* b) {
return String_Compare(&b->software, &a->software); return String_Compare(&b->software, &a->software);
@ -935,10 +938,12 @@ static void LTable_DrawRows(struct LTable* w) {
cc_string str; char strBuffer[STRING_SIZE]; cc_string str; char strBuffer[STRING_SIZE];
struct ServerInfo* entry; struct ServerInfo* entry;
struct DrawTextArgs args; struct DrawTextArgs args;
struct LTableCell cell;
int i, x, y, row, end; int i, x, y, row, end;
String_InitArray(str, strBuffer); String_InitArray(str, strBuffer);
DrawTextArgs_Make(&args, &str, w->rowFont, true); DrawTextArgs_Make(&args, &str, w->rowFont, true);
cell.table = w;
y = w->rowsBegY; y = w->rowsBegY;
end = w->topRow + w->visibleRows; end = w->topRow + w->visibleRows;
@ -950,13 +955,14 @@ static void LTable_DrawRows(struct LTable* w) {
entry = LTable_Get(row); entry = LTable_Get(row);
for (i = 0; i < w->numColumns; i++) { for (i = 0; i < w->numColumns; i++) {
args.text = str; args.text = str; cell.x = x; cell.y = y;
w->columns[i].DrawRow(entry, &args, x, y); cell.width = w->columns[i].width;
w->columns[i].DrawRow(entry, &args, &cell);
if (args.text.length) { if (args.text.length) {
Drawer2D_DrawClippedText(&Launcher_Framebuffer, &args, Drawer2D_DrawClippedText(&Launcher_Framebuffer, &args,
x + cellXOffset, y + rowYOffset, x + cellXOffset, y + rowYOffset,
w->columns[i].width - cellXPadding); cell.width - cellXPadding);
} }
x += w->columns[i].width; x += w->columns[i].width;

5
src/LWidgets.h
View File

@ -125,6 +125,7 @@ CC_NOINLINE void LSlider_Init(struct LScreen* s, struct LSlider* w, int width, i
struct ServerInfo; struct ServerInfo;
struct DrawTextArgs; struct DrawTextArgs;
struct LTableCell;
struct LTableColumn { struct LTableColumn {
/* Name of this column. */ /* Name of this column. */
@ -134,7 +135,7 @@ struct LTableColumn {
/* Draws the value of this column for the given row. */ /* Draws the value of this column for the given row. */
/* If args.Text is changed to something, that text gets drawn afterwards. */ /* If args.Text is changed to something, that text gets drawn afterwards. */
/* Most of the time that's all you need to do. */ /* Most of the time that's all you need to do. */
void (*DrawRow)(struct ServerInfo* row, struct DrawTextArgs* args, int x, int y); void (*DrawRow)(struct ServerInfo* row, struct DrawTextArgs* args, struct LTableCell* cell);
/* Returns sort order of two rows, based on value of this column in both rows. */ /* Returns sort order of two rows, based on value of this column in both rows. */
int (*SortOrder)(const struct ServerInfo* a, const struct ServerInfo* b); int (*SortOrder)(const struct ServerInfo* a, const struct ServerInfo* b);
/* Whether a vertical gridline (and padding) appears after this. */ /* Whether a vertical gridline (and padding) appears after this. */
@ -183,6 +184,8 @@ struct LTable {
int _lastRow; /* last clicked row (for doubleclick join) */ int _lastRow; /* last clicked row (for doubleclick join) */
cc_uint64 _lastClick; /* timestamp of last mouse click on a row */ cc_uint64 _lastClick; /* timestamp of last mouse click on a row */
}; };
struct LTableCell { struct LTable* table; int x, y, width; };
/* Gets the current ith row */ /* Gets the current ith row */
#define LTable_Get(row) (&FetchServersTask.servers[FetchServersTask.servers[row]._order]) #define LTable_Get(row) (&FetchServersTask.servers[FetchServersTask.servers[row]._order])