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

Mobile: Add More button for chat, which toggles whether ext/alt input menu shows

Browse Source 
This allows you to more easily enter colour codes / extended code page 437 characters
This commit is contained in:
UnknownShadow200 2021-03-07 22:47:45 +11:00
parent 421d3a7456
commit 938b2ec30a
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Screens.c
View File

@ -747,7 +747,7 @@ static struct ChatScreen {
struct TextGroupWidget status, bottomRight, chat, clientStatus; struct TextGroupWidget status, bottomRight, chat, clientStatus;
struct SpecialInputWidget altText; struct SpecialInputWidget altText;
#ifdef CC_BUILD_TOUCH #ifdef CC_BUILD_TOUCH
struct ButtonWidget send, cancel; struct ButtonWidget send, cancel, more;
#endif #endif
struct Texture statusTextures[CHAT_MAX_STATUS]; struct Texture statusTextures[CHAT_MAX_STATUS];
@ -1002,6 +1002,7 @@ static void ChatScreen_DrawChat(struct ChatScreen* s, double delta) {
#ifdef CC_BUILD_TOUCH #ifdef CC_BUILD_TOUCH
if (!Input_TouchMode) return; if (!Input_TouchMode) return;
Elem_Render(&s->more, delta);
Elem_Render(&s->send, delta); Elem_Render(&s->send, delta);
Elem_Render(&s->cancel, delta); Elem_Render(&s->cancel, delta);
#endif #endif
@ -1022,6 +1023,7 @@ static void ChatScreen_ContextLost(void* screen) {
#ifdef CC_BUILD_TOUCH #ifdef CC_BUILD_TOUCH
if (!Input_TouchMode) return; if (!Input_TouchMode) return;
Elem_Free(&s->more);
Elem_Free(&s->send); Elem_Free(&s->send);
Elem_Free(&s->cancel); Elem_Free(&s->cancel);
#endif #endif
@ -1036,6 +1038,7 @@ static void ChatScreen_ContextRecreated(void* screen) {
#ifdef CC_BUILD_TOUCH #ifdef CC_BUILD_TOUCH
if (!Input_TouchMode) return; if (!Input_TouchMode) return;
Gui_MakeTitleFont(&font); Gui_MakeTitleFont(&font);
ButtonWidget_SetConst(&s->more, "More", &font);
ButtonWidget_SetConst(&s->send, "Send", &font); ButtonWidget_SetConst(&s->send, "Send", &font);
ButtonWidget_SetConst(&s->cancel, "Cancel", &font); ButtonWidget_SetConst(&s->cancel, "Cancel", &font);
Font_Free(&font); Font_Free(&font);
@ -1072,9 +1075,11 @@ static void ChatScreen_Layout(void* screen) {
if (WindowInfo.SoftKeyboard == SOFT_KEYBOARD_SHIFT) { if (WindowInfo.SoftKeyboard == SOFT_KEYBOARD_SHIFT) {
Widget_SetLocation(&s->send, ANCHOR_MAX, ANCHOR_MAX, 10, 60); Widget_SetLocation(&s->send, ANCHOR_MAX, ANCHOR_MAX, 10, 60);
Widget_SetLocation(&s->cancel, ANCHOR_MAX, ANCHOR_MAX, 10, 10); Widget_SetLocation(&s->cancel, ANCHOR_MAX, ANCHOR_MAX, 10, 10);
Widget_SetLocation(&s->more, ANCHOR_MAX, ANCHOR_MAX, 10, 110);
} else { } else {
Widget_SetLocation(&s->send, ANCHOR_MAX, ANCHOR_MIN, 10, 10); Widget_SetLocation(&s->send, ANCHOR_MAX, ANCHOR_MIN, 10, 10);
Widget_SetLocation(&s->cancel, ANCHOR_MAX, ANCHOR_MIN, 10, 60); Widget_SetLocation(&s->cancel, ANCHOR_MAX, ANCHOR_MIN, 10, 60);
Widget_SetLocation(&s->more, ANCHOR_MAX, ANCHOR_MIN, 10, 110);
} }
#endif #endif
} }
@ -1148,6 +1153,11 @@ static int ChatScreen_KeyDown(void* screen, int key) {
return true; return true;
} }
static void ChatScreen_ToggleAltInput(struct ChatScreen* s) {
SpecialInputWidget_SetActive(&s->altText, !s->altText.active);
ChatScreen_UpdateChatYOffsets(s);
}
static void ChatScreen_KeyUp(void* screen, int key) { static void ChatScreen_KeyUp(void* screen, int key) {
struct ChatScreen* s = (struct ChatScreen*)screen; struct ChatScreen* s = (struct ChatScreen*)screen;
if (!s->grabsInput || (struct Screen*)s != Gui.InputGrab) return; if (!s->grabsInput || (struct Screen*)s != Gui.InputGrab) return;
@ -1159,8 +1169,7 @@ static void ChatScreen_KeyUp(void* screen, int key) {
if (Server.SupportsFullCP437 && key == KeyBinds[KEYBIND_EXT_INPUT]) { if (Server.SupportsFullCP437 && key == KeyBinds[KEYBIND_EXT_INPUT]) {
if (!WindowInfo.Focused) return; if (!WindowInfo.Focused) return;
SpecialInputWidget_SetActive(&s->altText, !s->altText.active); ChatScreen_ToggleAltInput(s);
ChatScreen_UpdateChatYOffsets(s);
} }
} }
@ -1199,6 +1208,9 @@ static int ChatScreen_PointerDown(void* screen, int id, int x, int y) {
if (Widget_Contains(&s->cancel, x, y)) { if (Widget_Contains(&s->cancel, x, y)) {
ChatScreen_EnterChatInput(s, true); return TOUCH_TYPE_GUI; ChatScreen_EnterChatInput(s, true); return TOUCH_TYPE_GUI;
} }
if (Widget_Contains(&s->more, x, y)) {
ChatScreen_ToggleAltInput(s); return TOUCH_TYPE_GUI;
}
#endif #endif
if (!Widget_Contains(&s->chat, x, y)) { if (!Widget_Contains(&s->chat, x, y)) {
@ -1257,6 +1269,7 @@ static void ChatScreen_Init(void* screen) {
if (!Input_TouchMode) return; if (!Input_TouchMode) return;
ButtonWidget_Init(&s->send, 100, NULL); ButtonWidget_Init(&s->send, 100, NULL);
ButtonWidget_Init(&s->cancel, 100, NULL); ButtonWidget_Init(&s->cancel, 100, NULL);
ButtonWidget_Init(&s->more, 100, NULL);
#endif #endif
} }