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

Adjust inventory to reduce rows if it doesn't fit on screen

Browse Source
This commit is contained in:
UnknownShadow200 2020-09-20 23:45:45 +10:00
parent f1faf3250d
commit 75d437fdb1
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/Widgets.c
View File

@ -256,26 +256,25 @@ void ButtonWidget_SetConst(struct ButtonWidget* w, const char* text, struct Font
/*########################################################################################################################* /*########################################################################################################################*
*-----------------------------------------------------ScrollbarWidget-----------------------------------------------------* *-----------------------------------------------------ScrollbarWidget-----------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
#define TABLE_MAX_ROWS_DISPLAYED 8
#define SCROLL_BACK_COL PackedCol_Make( 10, 10, 10, 220) #define SCROLL_BACK_COL PackedCol_Make( 10, 10, 10, 220)
#define SCROLL_BAR_COL PackedCol_Make(100, 100, 100, 220) #define SCROLL_BAR_COL PackedCol_Make(100, 100, 100, 220)
#define SCROLL_HOVER_COL PackedCol_Make(122, 122, 122, 220) #define SCROLL_HOVER_COL PackedCol_Make(122, 122, 122, 220)
static void ScrollbarWidget_ClampTopRow(struct ScrollbarWidget* w) { static void ScrollbarWidget_ClampTopRow(struct ScrollbarWidget* w) {
int maxTop = w->totalRows - TABLE_MAX_ROWS_DISPLAYED; int maxTop = w->rowsTotal - w->rowsVisible;
if (w->topRow >= maxTop) w->topRow = maxTop; if (w->topRow >= maxTop) w->topRow = maxTop;
if (w->topRow < 0) w->topRow = 0; if (w->topRow < 0) w->topRow = 0;
} }
static float ScrollbarWidget_GetScale(struct ScrollbarWidget* w) { static float ScrollbarWidget_GetScale(struct ScrollbarWidget* w) {
float rows = (float)w->totalRows; float rows = (float)w->rowsTotal;
return (w->height - w->borderY * 2) / rows; return (w->height - w->borderY * 2) / rows;
} }
static void ScrollbarWidget_GetScrollbarCoords(struct ScrollbarWidget* w, int* y, int* height) { static void ScrollbarWidget_GetScrollbarCoords(struct ScrollbarWidget* w, int* y, int* height) {
float scale = ScrollbarWidget_GetScale(w); float scale = ScrollbarWidget_GetScale(w);
*y = Math_Ceil(w->topRow * scale) + w->borderY; *y = Math_Ceil(w->topRow * scale) + w->borderY;
*height = Math_Ceil(TABLE_MAX_ROWS_DISPLAYED * scale); *height = Math_Ceil(w->rowsVisible * scale);
*height = min(*y + *height, w->height - w->borderY) - *y; *height = min(*y + *height, w->height - w->borderY) - *y;
} }
@ -318,9 +317,9 @@ static int ScrollbarWidget_PointerDown(void* widget, int id, int x, int y) {
ScrollbarWidget_GetScrollbarCoords(w, &posY, &height); ScrollbarWidget_GetScrollbarCoords(w, &posY, &height);
if (y < posY) { if (y < posY) {
w->topRow -= TABLE_MAX_ROWS_DISPLAYED; w->topRow -= w->rowsVisible;
} else if (y >= posY + height) { } else if (y >= posY + height) {
w->topRow += TABLE_MAX_ROWS_DISPLAYED; w->topRow += w->rowsVisible;
} else { } else {
w->draggingId = id; w->draggingId = id;
w->dragOffset = y - posY; w->dragOffset = y - posY;
@ -378,7 +377,8 @@ void ScrollbarWidget_Create(struct ScrollbarWidget* w) {
w->offsets[1] = Display_ScaleY(-1); w->offsets[1] = Display_ScaleY(-1);
w->offsets[2] = Display_ScaleY(-1 + 4); w->offsets[2] = Display_ScaleY(-1 + 4);
w->totalRows = 0; w->rowsTotal = 0;
w->rowsVisible = 0;
w->topRow = 0; w->topRow = 0;
w->scrollingAcc = 0.0f; w->scrollingAcc = 0.0f;
w->draggingId = 0; w->draggingId = 0;
@ -564,13 +564,13 @@ void HotbarWidget_Create(struct HotbarWidget* w) {
/*########################################################################################################################* /*########################################################################################################################*
*-------------------------------------------------------TableWidget-------------------------------------------------------* *-------------------------------------------------------TableWidget-------------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
static int Table_X(struct TableWidget* w) { return w->x - w->xPadding; } static int Table_X(struct TableWidget* w) { return w->x - w->paddingX; }
static int Table_Y(struct TableWidget* w) { return w->y - 5 - 30; } static int Table_Y(struct TableWidget* w) { return w->y - 5 - 30; }
static int Table_Width(struct TableWidget* w) { static int Table_Width(struct TableWidget* w) {
return w->blocksPerRow * w->cellSizeX + w->xPadding * 2; return w->blocksPerRow * w->cellSizeX + w->paddingX * 2;
} }
static int Table_Height(struct TableWidget* w) { static int Table_Height(struct TableWidget* w) {
return w->rowsDisplayed * w->cellSizeY + 10 + 40; return w->rowsVisible * w->cellSizeY + 10 + 40;
} }
#define TABLE_MAX_VERTICES (8 * 10 * ISOMETRICDRAWER_MAXVERTICES) #define TABLE_MAX_VERTICES (8 * 10 * ISOMETRICDRAWER_MAXVERTICES)
@ -582,7 +582,7 @@ static cc_bool TableWidget_GetCoords(struct TableWidget* w, int i, int* cellX, i
*cellX = w->x + w->cellSizeX * x; *cellX = w->x + w->cellSizeX * x;
*cellY = w->y + w->cellSizeY * y + 3; *cellY = w->y + w->cellSizeY * y + 3;
return y >= 0 && y < TABLE_MAX_ROWS_DISPLAYED; return y >= 0 && y < w->rowsVisible;
} }
static void TableWidget_MoveCursorToSelected(struct TableWidget* w) { static void TableWidget_MoveCursorToSelected(struct TableWidget* w) {
@ -687,7 +687,7 @@ static void TableWidget_Render(void* widget, double delta) {
Gfx_Draw2DGradient(Table_X(w), Table_Y(w), Gfx_Draw2DGradient(Table_X(w), Table_Y(w),
Table_Width(w), Table_Height(w), topBackCol, bottomBackCol); Table_Width(w), Table_Height(w), topBackCol, bottomBackCol);
if (w->rowsDisplayed < w->rowsTotal) { if (w->rowsVisible < w->rowsTotal) {
Elem_Render(&w->scroll, delta); Elem_Render(&w->scroll, delta);
} }
@ -696,6 +696,7 @@ static void TableWidget_Render(void* widget, double delta) {
if (w->selectedIndex != -1 && Game_ClassicMode && w->blocks[w->selectedIndex] != BLOCK_AIR) { if (w->selectedIndex != -1 && Game_ClassicMode && w->blocks[w->selectedIndex] != BLOCK_AIR) {
TableWidget_GetCoords(w, w->selectedIndex, &x, &y); TableWidget_GetCoords(w, w->selectedIndex, &x, &y);
/* TODO: Need two size arguments, in case X/Y dpi differs */
off = cellSizeX * 0.1f; off = cellSizeX * 0.1f;
size = (int)(cellSizeX + off * 2); size = (int)(cellSizeX + off * 2);
Gfx_Draw2DGradient((int)(x - off), (int)(y - off), Gfx_Draw2DGradient((int)(x - off), (int)(y - off),
@ -745,24 +746,31 @@ void TableWidget_Recreate(struct TableWidget* w) {
static void TableWidget_Reposition(void* widget) { static void TableWidget_Reposition(void* widget) {
struct TableWidget* w = (struct TableWidget*)widget; struct TableWidget* w = (struct TableWidget*)widget;
float scale = Gui_GetInventoryScale(); float scale = Gui_GetInventoryScale();
int cellSize, rowsDisplayed; int cellSize;
cellSize = (int)(50 * Math_SqrtF(scale)); cellSize = (int)(50 * Math_SqrtF(scale));
w->cellSizeX = Display_ScaleX(cellSize); w->cellSizeX = Display_ScaleX(cellSize);
w->cellSizeY = Display_ScaleY(cellSize); w->cellSizeY = Display_ScaleY(cellSize);
w->selBlockExpand = 25.0f * Math_SqrtF(scale); w->selBlockExpand = 25.0f * Math_SqrtF(scale);
w->rowsDisplayed = min(TABLE_MAX_ROWS_DISPLAYED, w->rowsTotal); w->rowsVisible = min(8, w->rowsTotal); /* 8 rows max */
do {
w->width = w->cellSizeX * w->blocksPerRow; w->width = w->cellSizeX * w->blocksPerRow;
w->height = w->cellSizeY * rowsDisplayed; w->height = w->cellSizeY * w->rowsVisible;
Widget_CalcPosition(w); Widget_CalcPosition(w);
TableWidget_UpdateDescTexPos(w); TableWidget_UpdateDescTexPos(w);
/* Does the table fit on screen? */
if (Table_Y(w) >= 0) break;
w->rowsVisible--;
} while (w->rowsVisible > 1);
w->scroll.x = Table_X(w) + Table_Width(w); w->scroll.x = Table_X(w) + Table_Width(w);
w->scroll.y = Table_Y(w); w->scroll.y = Table_Y(w);
w->scroll.height = Table_Height(w); w->scroll.height = Table_Height(w);
w->scroll.totalRows = w->rowsTotal; w->scroll.rowsTotal = w->rowsTotal;
w->scroll.rowsVisible = w->rowsVisible;
} }
static void TableWidget_ScrollRelative(struct TableWidget* w, int delta) { static void TableWidget_ScrollRelative(struct TableWidget* w, int delta) {
@ -834,7 +842,7 @@ static int TableWidget_PointerMove(void* widget, int id, int x, int y) {
w->selectedIndex = -1; w->selectedIndex = -1;
cellSizeX = w->cellSizeX; cellSizeX = w->cellSizeX;
cellSizeY = w->cellSizeY; cellSizeY = w->cellSizeY;
maxHeight = cellSizeY * TABLE_MAX_ROWS_DISPLAYED; maxHeight = cellSizeY * w->rowsVisible;
if (Gui_Contains(w->x, w->y + 3, w->width, maxHeight - 3 * 2, x, y)) { if (Gui_Contains(w->x, w->y + 3, w->width, maxHeight - 3 * 2, x, y)) {
for (i = 0; i < w->blocksCount; i++) { for (i = 0; i < w->blocksCount; i++) {
@ -882,7 +890,7 @@ void TableWidget_Create(struct TableWidget* w) {
w->horAnchor = ANCHOR_CENTRE; w->horAnchor = ANCHOR_CENTRE;
w->verAnchor = ANCHOR_CENTRE; w->verAnchor = ANCHOR_CENTRE;
w->lastX = -20; w->lastY = -20; w->lastX = -20; w->lastY = -20;
w->xPadding = Display_ScaleX(15); w->paddingX = Display_ScaleX(15);
} }
void TableWidget_SetBlockTo(struct TableWidget* w, BlockID block) { void TableWidget_SetBlockTo(struct TableWidget* w, BlockID block) {
@ -896,7 +904,7 @@ void TableWidget_SetBlockTo(struct TableWidget* w, BlockID block) {
if (block == BLOCK_AIR) w->selectedIndex = -1; if (block == BLOCK_AIR) w->selectedIndex = -1;
w->scroll.topRow = w->selectedIndex / w->blocksPerRow; w->scroll.topRow = w->selectedIndex / w->blocksPerRow;
w->scroll.topRow -= (TABLE_MAX_ROWS_DISPLAYED - 1); w->scroll.topRow -= (w->rowsVisible - 1);
ScrollbarWidget_ClampTopRow(&w->scroll); ScrollbarWidget_ClampTopRow(&w->scroll);
TableWidget_MoveCursorToSelected(w); TableWidget_MoveCursorToSelected(w);
TableWidget_RecreateDescTex(w); TableWidget_RecreateDescTex(w);

7
src/Widgets.h
View File

@ -54,7 +54,7 @@ CC_NOINLINE void ButtonWidget_SetConst(struct ButtonWidget* w, const char* text,
/* Clickable and draggable scrollbar. */ /* Clickable and draggable scrollbar. */
struct ScrollbarWidget { struct ScrollbarWidget {
Widget_Body Widget_Body
int totalRows, topRow; int topRow, rowsTotal, rowsVisible;
float scrollingAcc; float scrollingAcc;
int dragOffset; int dragOffset;
int draggingId; int draggingId;
@ -81,7 +81,7 @@ CC_NOINLINE void HotbarWidget_Create(struct HotbarWidget* w);
struct TableWidget { struct TableWidget {
Widget_Body Widget_Body
int blocksCount, blocksPerRow; int blocksCount, blocksPerRow;
int rowsTotal, rowsDisplayed; int rowsTotal, rowsVisible;
int lastCreatedIndex; int lastCreatedIndex;
struct FontDesc* font; struct FontDesc* font;
int selectedIndex, cellSizeX, cellSizeY; int selectedIndex, cellSizeX, cellSizeY;
@ -92,8 +92,7 @@ struct TableWidget {
BlockID blocks[BLOCK_COUNT]; BlockID blocks[BLOCK_COUNT];
struct ScrollbarWidget scroll; struct ScrollbarWidget scroll;
struct Texture descTex; struct Texture descTex;
int lastX, lastY; int lastX, lastY, paddingX;
int xPadding;
}; };
CC_NOINLINE void TableWidget_Create(struct TableWidget* w); CC_NOINLINE void TableWidget_Create(struct TableWidget* w);