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

and fix padding for top and bottom of inventory table

Browse Source
This commit is contained in:
UnknownShadow200 2020-09-21 00:17:27 +10:00
parent 75d437fdb1
commit c200ffffe8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Widgets.c
View File

@ -565,12 +565,12 @@ void HotbarWidget_Create(struct HotbarWidget* w) {
*-------------------------------------------------------TableWidget-------------------------------------------------------* *-------------------------------------------------------TableWidget-------------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
static int Table_X(struct TableWidget* w) { return w->x - w->paddingX; } 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 - w->paddingTopY; }
static int Table_Width(struct TableWidget* w) { static int Table_Width(struct TableWidget* w) {
return w->blocksPerRow * w->cellSizeX + w->paddingX * 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->rowsVisible * w->cellSizeY + 10 + 40; return w->rowsVisible * w->cellSizeY + w->paddingTopY + w->paddingMaxY;
} }
#define TABLE_MAX_VERTICES (8 * 10 * ISOMETRICDRAWER_MAXVERTICES) #define TABLE_MAX_VERTICES (8 * 10 * ISOMETRICDRAWER_MAXVERTICES)
@ -890,7 +890,10 @@ 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->paddingX = Display_ScaleX(15); w->paddingX = Display_ScaleX(15);
w->paddingTopY = Display_ScaleY(15 + 20);
w->paddingMaxY = Display_ScaleX(15);
} }
void TableWidget_SetBlockTo(struct TableWidget* w, BlockID block) { void TableWidget_SetBlockTo(struct TableWidget* w, BlockID block) {

1
src/Widgets.h
View File

@ -93,6 +93,7 @@ struct TableWidget {
struct ScrollbarWidget scroll; struct ScrollbarWidget scroll;
struct Texture descTex; struct Texture descTex;
int lastX, lastY, paddingX; int lastX, lastY, paddingX;
int paddingTopY, paddingMaxY;
}; };
CC_NOINLINE void TableWidget_Create(struct TableWidget* w); CC_NOINLINE void TableWidget_Create(struct TableWidget* w);