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

fix alt text being placed improperly on resize

Browse Source
This commit is contained in:
UnknownShadow200 2019-08-25 09:48:18 +10:00
parent 8da37b0437
commit 5d4a3a0df4
2 changed files with 33 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/Screens.c
View File

@ -658,22 +658,19 @@ void GeneratingScreen_Show(void) {
static struct HUDScreen HUDScreen_Instance; static struct HUDScreen HUDScreen_Instance;
#define CH_EXTENT 16 #define CH_EXTENT 16
static int HUDScreen_BottomOffset(void) { return HUDScreen_Instance.hotbar.height; } static void HUDScreen_UpdateChatYOffsets(struct HUDScreen* s) {
static int HUDScreen_InputUsedHeight(struct HUDScreen* s) { int pad, y;
if (s->altText.height == 0) {
return s->input.base.height + 20; y = min(s->input.base.y, s->hotbar.y);
} else { y -= s->input.base.yOffset; /* add some padding */
return (Window_Height - s->altText.y) + 5; s->altText.yOffset = Window_Height - y;
}
}
static void HUDScreen_UpdateAltTextY(struct HUDScreen* s) {
struct InputWidget* input = &s->input.base;
int height = max(input->height + input->yOffset, HUDScreen_BottomOffset());
height += input->yOffset;
s->altText.yOffset = height;
Widget_Reposition(&s->altText); Widget_Reposition(&s->altText);
pad = s->altText.active ? 5 : 10;
s->clientStatus.yOffset = Window_Height - s->altText.y + pad;
Widget_Reposition(&s->clientStatus);
s->chat.yOffset = s->clientStatus.yOffset + s->clientStatus.height;
Widget_Reposition(&s->chat);
} }
static String HUDScreen_GetChat(void* obj, int i) { static String HUDScreen_GetChat(void* obj, int i) {
@ -715,15 +712,14 @@ static void HUDScreen_ChatUpdateFont(struct HUDScreen* s) {
} }
static void HUDScreen_ChatUpdateLayout(struct HUDScreen* s) { static void HUDScreen_ChatUpdateLayout(struct HUDScreen* s) {
int yOffset = HUDScreen_BottomOffset() + 15; int yOffset = s->hotbar.height + 15;
Widget_SetLocation(&s->input.base, ANCHOR_MIN, ANCHOR_MAX, 5, 5); Widget_SetLocation(&s->input.base, ANCHOR_MIN, ANCHOR_MAX, 5, 5);
Widget_SetLocation(&s->altText, ANCHOR_MIN, ANCHOR_MAX, 5, 5); Widget_SetLocation(&s->altText, ANCHOR_MIN, ANCHOR_MAX, 5, 5);
HUDScreen_UpdateAltTextY(s); Widget_SetLocation(&s->status, ANCHOR_MAX, ANCHOR_MIN, 0, 0);
Widget_SetLocation(&s->status, ANCHOR_MAX, ANCHOR_MIN, 0, 0);
Widget_SetLocation(&s->bottomRight, ANCHOR_MAX, ANCHOR_MAX, 0, yOffset); Widget_SetLocation(&s->bottomRight, ANCHOR_MAX, ANCHOR_MAX, 0, yOffset);
Widget_SetLocation(&s->chat, ANCHOR_MIN, ANCHOR_MAX, 10, yOffset); Widget_SetLocation(&s->chat, ANCHOR_MIN, ANCHOR_MAX, 10, 0);
Widget_SetLocation(&s->clientStatus, ANCHOR_MIN, ANCHOR_MAX, 10, yOffset); Widget_SetLocation(&s->clientStatus, ANCHOR_MIN, ANCHOR_MAX, 10, 0);
HUDScreen_UpdateChatYOffsets(s);
} }
static void HUDScreen_ChatInit(struct HUDScreen* s) { static void HUDScreen_ChatInit(struct HUDScreen* s) {
@ -759,19 +755,6 @@ static void HUDScreen_Redraw(struct HUDScreen* s) {
SpecialInputWidget_Redraw(&s->altText); SpecialInputWidget_Redraw(&s->altText);
} }
static void HUDScreen_UpdateChatYOffset(struct HUDScreen* s, bool force) {
int height = HUDScreen_InputUsedHeight(s);
if (force || height != s->inputOldHeight) {
int bottomOffset = HUDScreen_BottomOffset() + 15;
s->clientStatus.yOffset = max(bottomOffset, height);
Widget_Reposition(&s->clientStatus);
s->chat.yOffset = s->clientStatus.yOffset + s->clientStatus.height;
Widget_Reposition(&s->chat);
s->inputOldHeight = height;
}
}
static int HUDScreen_ClampChatIndex(int index) { static int HUDScreen_ClampChatIndex(int index) {
int maxIndex = Chat_Log.count - Gui_Chatlines; int maxIndex = Chat_Log.count - Gui_Chatlines;
int minIndex = min(0, maxIndex); int minIndex = min(0, maxIndex);
@ -807,6 +790,7 @@ static void HUDScreen_EnterChatInput(struct HUDScreen* s, bool close) {
input = &s->input.base; input = &s->input.base;
input->OnPressedEnter(input); input->OnPressedEnter(input);
SpecialInputWidget_SetActive(&s->altText, false); SpecialInputWidget_SetActive(&s->altText, false);
HUDScreen_UpdateChatYOffsets(s);
/* Reset chat when user has scrolled up in chat history */ /* Reset chat when user has scrolled up in chat history */
defaultIndex = Chat_Log.count - Gui_Chatlines; defaultIndex = Chat_Log.count - Gui_Chatlines;
@ -886,7 +870,7 @@ static void HUDScreen_ChatReceived(void* screen, const String* msg, int type) {
TextWidget_Set(&s->announcement, msg, &s->announcementFont); TextWidget_Set(&s->announcement, msg, &s->announcementFont);
} else if (type >= MSG_TYPE_CLIENTSTATUS_1 && type <= MSG_TYPE_CLIENTSTATUS_2) { } else if (type >= MSG_TYPE_CLIENTSTATUS_1 && type <= MSG_TYPE_CLIENTSTATUS_2) {
TextGroupWidget_Redraw(&s->clientStatus, type - MSG_TYPE_CLIENTSTATUS_1); TextGroupWidget_Redraw(&s->clientStatus, type - MSG_TYPE_CLIENTSTATUS_1);
HUDScreen_UpdateChatYOffset(s, true); HUDScreen_UpdateChatYOffsets(s);
} }
} }
@ -927,8 +911,6 @@ static void HUDScreen_DrawChat(struct HUDScreen* s, double delta) {
HUDScreen_UpdateTexpackStatus(s); HUDScreen_UpdateTexpackStatus(s);
if (!Game_PureClassic) { Elem_Render(&s->status, delta); } if (!Game_PureClassic) { Elem_Render(&s->status, delta); }
Elem_Render(&s->bottomRight, delta); Elem_Render(&s->bottomRight, delta);
HUDScreen_UpdateChatYOffset(s, false);
Elem_Render(&s->clientStatus, delta); Elem_Render(&s->clientStatus, delta);
now = DateTime_CurrentUTC_MS(); now = DateTime_CurrentUTC_MS();
@ -996,7 +978,7 @@ static void HUDScreen_ContextRecreated(void* screen) {
HUDScreen_ChatUpdateLayout(s); HUDScreen_ChatUpdateLayout(s);
HUDScreen_Redraw(s); HUDScreen_Redraw(s);
HUDScreen_UpdateChatYOffset(s, true); HUDScreen_UpdateChatYOffsets(s);
HUDScreen_RemakePlayerList(s); HUDScreen_RemakePlayerList(s);
Widget_Reposition(&s->hotbar); Widget_Reposition(&s->hotbar);
} }
@ -1018,7 +1000,7 @@ static bool HUDScreen_KeyPress(void* screen, char keyChar) {
} }
InputWidget_Append(&s->input.base, keyChar); InputWidget_Append(&s->input.base, keyChar);
HUDScreen_UpdateAltTextY(s); HUDScreen_UpdateChatYOffsets(s);
return true; return true;
} }
@ -1053,7 +1035,7 @@ static bool HUDScreen_KeyDown(void* screen, Key key) {
HUDScreen_ScrollChatBy(s, +Gui_Chatlines); HUDScreen_ScrollChatBy(s, +Gui_Chatlines);
} else { } else {
Elem_HandlesKeyDown(&s->input.base, key); Elem_HandlesKeyDown(&s->input.base, key);
HUDScreen_UpdateAltTextY(s); HUDScreen_UpdateChatYOffsets(s);
} }
return key < KEY_F1 || key > KEY_F35; return key < KEY_F1 || key > KEY_F35;
} }
@ -1088,6 +1070,7 @@ static bool HUDScreen_KeyUp(void* screen, Key key) {
if (Server.SupportsFullCP437 && key == KeyBinds[KEYBIND_EXT_INPUT]) { if (Server.SupportsFullCP437 && key == KeyBinds[KEYBIND_EXT_INPUT]) {
if (!Window_Focused) return true; if (!Window_Focused) return true;
SpecialInputWidget_SetActive(&s->altText, !s->altText.active); SpecialInputWidget_SetActive(&s->altText, !s->altText.active);
HUDScreen_UpdateChatYOffsets(s);
} }
return true; return true;
} }
@ -1127,7 +1110,7 @@ static bool HUDScreen_MouseDown(void* screen, int x, int y, MouseButton btn) {
if (!Widget_Contains(&s->chat, x, y)) { if (!Widget_Contains(&s->chat, x, y)) {
if (s->altText.active && Widget_Contains(&s->altText, x, y)) { if (s->altText.active && Widget_Contains(&s->altText, x, y)) {
Elem_HandlesMouseDown(&s->altText, x, y, btn); Elem_HandlesMouseDown(&s->altText, x, y, btn);
HUDScreen_UpdateAltTextY(s); HUDScreen_UpdateChatYOffsets(s);
return true; return true;
} }
Elem_HandlesMouseDown(&s->input.base, x, y, btn); Elem_HandlesMouseDown(&s->input.base, x, y, btn);
@ -1145,8 +1128,7 @@ static bool HUDScreen_MouseDown(void* screen, int x, int y, MouseButton btn) {
if (Utils_IsUrlPrefix(&text)) { if (Utils_IsUrlPrefix(&text)) {
UrlWarningOverlay_Show(&text); UrlWarningOverlay_Show(&text);
} else if (Gui_ClickableChat) { } else if (Gui_ClickableChat) {
InputWidget_AppendString(&s->input.base, &text); HUDScreen_AppendInput(&text);
HUDScreen_UpdateAltTextY(s);
} }
return true; return true;
} }
@ -1234,6 +1216,7 @@ void HUDScreen_OpenInput(const String* text) {
void HUDScreen_AppendInput(const String* text) { void HUDScreen_AppendInput(const String* text) {
struct HUDScreen* s = &HUDScreen_Instance; struct HUDScreen* s = &HUDScreen_Instance;
InputWidget_AppendString(&s->input.base, text); InputWidget_AppendString(&s->input.base, text);
HUDScreen_UpdateChatYOffsets(s);
} }
void HUDScreen_SetChatlines(int lines) { void HUDScreen_SetChatlines(int lines) {

10
src/Widgets.c
View File

@ -351,7 +351,6 @@ static void HotbarWidget_RenderHotbarBlocks(struct HotbarWidget* w) {
} }
static void HotbarWidget_RepositonBackgroundTexture(struct HotbarWidget* w) { static void HotbarWidget_RepositonBackgroundTexture(struct HotbarWidget* w) {
w->backTex.ID = GFX_NULL;
Tex_SetRect(w->backTex, w->x,w->y, w->width,w->height); Tex_SetRect(w->backTex, w->x,w->y, w->width,w->height);
Tex_SetUV(w->backTex, 0,0, 182/256.0f,22/256.0f); Tex_SetUV(w->backTex, 0,0, 182/256.0f,22/256.0f);
} }
@ -362,7 +361,6 @@ static void HotbarWidget_RepositionSelectionTexture(struct HotbarWidget* w) {
int vSize = (int)(22.0f * scale); int vSize = (int)(22.0f * scale);
int y = w->y + (w->height - (int)(23.0f * scale)); int y = w->y + (w->height - (int)(23.0f * scale));
w->selTex.ID = GFX_NULL;
Tex_SetRect(w->selTex, 0,y, hSize,vSize); Tex_SetRect(w->selTex, 0,y, hSize,vSize);
Tex_SetUV(w->selTex, 0,22/256.0f, 24/256.0f,44/256.0f); Tex_SetUV(w->selTex, 0,22/256.0f, 24/256.0f,44/256.0f);
} }
@ -956,6 +954,8 @@ static void InputWidget_OnPressedEnter(void* widget) {
struct InputWidget* w = (struct InputWidget*)widget; struct InputWidget* w = (struct InputWidget*)widget;
InputWidget_Clear(w); InputWidget_Clear(w);
w->height = w->lineHeight; w->height = w->lineHeight;
/* TODO get rid of this awful hack.. */
Widget_Reposition(w);
} }
void InputWidget_Clear(struct InputWidget* w) { void InputWidget_Clear(struct InputWidget* w) {
@ -2691,8 +2691,7 @@ static void SpecialInputWidget_Make(struct SpecialInputWidget* w, struct Special
void SpecialInputWidget_Redraw(struct SpecialInputWidget* w) { void SpecialInputWidget_Redraw(struct SpecialInputWidget* w) {
SpecialInputWidget_Make(w, &w->tabs[w->selectedIndex]); SpecialInputWidget_Make(w, &w->tabs[w->selectedIndex]);
w->width = w->tex.Width; w->width = w->tex.Width;
w->height = w->active ? w->tex.Height : 0;
w->pendingRedraw = false; w->pendingRedraw = false;
Widget_Reposition(w); Widget_Reposition(w);
} }
@ -2709,6 +2708,7 @@ static void SpecialInputWidget_Free(void* widget) {
static void SpecialInputWidget_Reposition(void* widget) { static void SpecialInputWidget_Reposition(void* widget) {
struct SpecialInputWidget* w = (struct SpecialInputWidget*)widget; struct SpecialInputWidget* w = (struct SpecialInputWidget*)widget;
w->height = w->active ? w->tex.Height : 0;
Widget_CalcPosition(w); Widget_CalcPosition(w);
w->tex.X = w->x; w->tex.Y = w->y; w->tex.X = w->x; w->tex.Y = w->y;
} }
@ -2737,8 +2737,8 @@ void SpecialInputWidget_UpdateCols(struct SpecialInputWidget* w) {
void SpecialInputWidget_SetActive(struct SpecialInputWidget* w, bool active) { void SpecialInputWidget_SetActive(struct SpecialInputWidget* w, bool active) {
w->active = active; w->active = active;
w->height = active ? w->tex.Height : 0;
if (active && w->pendingRedraw) SpecialInputWidget_Redraw(w); if (active && w->pendingRedraw) SpecialInputWidget_Redraw(w);
Widget_Reposition(w);
} }
static const struct WidgetVTABLE SpecialInputWidget_VTABLE = { static const struct WidgetVTABLE SpecialInputWidget_VTABLE = {