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

Fix progress bar in loading screen not being scaled by DPI and overlapping the motd with high DPI

Browse Source
This commit is contained in:
UnknownShadow200 2020-08-22 00:46:41 +10:00
parent df9c74cf89
commit 2939f46df1
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Screens.c
View File

@ -1533,6 +1533,7 @@ static struct LoadingScreen {
struct FontDesc font; struct FontDesc font;
float progress; float progress;
int progX, progY, progWidth, progHeight;
struct TextWidget title, message; struct TextWidget title, message;
String titleStr, messageStr; String titleStr, messageStr;
const char* lastState; const char* lastState;
@ -1550,8 +1551,16 @@ static void LoadingScreen_SetMessage(struct LoadingScreen* s) {
static void LoadingScreen_Layout(void* screen) { static void LoadingScreen_Layout(void* screen) {
struct LoadingScreen* s = (struct LoadingScreen*)screen; struct LoadingScreen* s = (struct LoadingScreen*)screen;
int y;
Widget_SetLocation(&s->title, ANCHOR_CENTRE, ANCHOR_CENTRE, 0, -31); Widget_SetLocation(&s->title, ANCHOR_CENTRE, ANCHOR_CENTRE, 0, -31);
Widget_SetLocation(&s->message, ANCHOR_CENTRE, ANCHOR_CENTRE, 0, 17); Widget_SetLocation(&s->message, ANCHOR_CENTRE, ANCHOR_CENTRE, 0, 17);
s->progWidth = Display_ScaleX(200);
s->progX = Gui_CalcPos(ANCHOR_CENTRE, 0, s->progWidth, WindowInfo.Width);
y = Display_ScaleY(34);
s->progHeight = Display_ScaleY(4);
s->progY = Gui_CalcPos(ANCHOR_CENTRE, y, s->progHeight, WindowInfo.Height);
} }
static void LoadingScreen_ContextLost(void* screen) { static void LoadingScreen_ContextLost(void* screen) {
@ -1631,14 +1640,11 @@ static void LoadingScreen_Init(void* screen) {
Event_Register_(&WorldEvents.MapLoaded, s, LoadingScreen_MapLoaded); Event_Register_(&WorldEvents.MapLoaded, s, LoadingScreen_MapLoaded);
} }
#define PROG_BAR_WIDTH 200
#define PROG_BAR_HEIGHT 4
static void LoadingScreen_Render(void* screen, double delta) { static void LoadingScreen_Render(void* screen, double delta) {
struct LoadingScreen* s = (struct LoadingScreen*)screen; struct LoadingScreen* s = (struct LoadingScreen*)screen;
PackedCol backCol = PackedCol_Make(128, 128, 128, 255); PackedCol backCol = PackedCol_Make(128, 128, 128, 255);
PackedCol progCol = PackedCol_Make(128, 255, 128, 255); PackedCol progCol = PackedCol_Make(128, 255, 128, 255);
int progWidth; int filledWidth;
int x, y;
Gfx_SetTexturing(true); Gfx_SetTexturing(true);
LoadingScreen_DrawBackground(); LoadingScreen_DrawBackground();
@ -1647,12 +1653,9 @@ static void LoadingScreen_Render(void* screen, double delta) {
Elem_Render(&s->message, delta); Elem_Render(&s->message, delta);
Gfx_SetTexturing(false); Gfx_SetTexturing(false);
x = Gui_CalcPos(ANCHOR_CENTRE, 0, PROG_BAR_WIDTH, WindowInfo.Width); filledWidth = (int)(s->progWidth * s->progress);
y = Gui_CalcPos(ANCHOR_CENTRE, 34, PROG_BAR_HEIGHT, WindowInfo.Height); Gfx_Draw2DFlat(s->progX, s->progY, s->progWidth, s->progHeight, backCol);
progWidth = (int)(PROG_BAR_WIDTH * s->progress); Gfx_Draw2DFlat(s->progX, s->progY, filledWidth, s->progHeight, progCol);
Gfx_Draw2DFlat(x, y, PROG_BAR_WIDTH, PROG_BAR_HEIGHT, backCol);
Gfx_Draw2DFlat(x, y, progWidth, PROG_BAR_HEIGHT, progCol);
} }
static void LoadingScreen_Free(void* screen) { static void LoadingScreen_Free(void* screen) {