From 0e196cf6afb9552607bbbb5d4bf11d166f2c4349 Mon Sep 17 00:00:00 2001 From: MysterD Date: Wed, 8 Nov 2023 14:45:36 -0800 Subject: [PATCH] Made console scale to window height --- src/pc/djui/djui_console.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pc/djui/djui_console.c b/src/pc/djui/djui_console.c index 359e1f0a..b39949a8 100644 --- a/src/pc/djui/djui_console.c +++ b/src/pc/djui/djui_console.c @@ -3,6 +3,7 @@ #include "djui.h" #include "djui_panel_menu.h" #include "djui_console.h" +#include "pc/pc_main.h" #define MAX_CONSOLE_MESSAGES 500 @@ -16,6 +17,12 @@ void djui_console_toggle(void) { gDjuiConsoleFocus = !gDjuiConsoleFocus; djui_base_set_visible(&gDjuiConsole->panel->base, gDjuiConsoleFocus); + u32 windowWidth, windowHeight; + wm_api->get_dimensions(&windowWidth, &windowHeight); + f32 scaledHeight = (windowHeight * 0.95f) / djui_gfx_get_scale(); + + djui_base_set_size(&gDjuiConsole->panel->base, 1000, MIN(scaledHeight, 1000)); + if (gDjuiConsoleFocus) { if (gDjuiChatBoxFocus) { djui_chat_box_toggle(); } djui_interactable_set_input_focus(&gDjuiConsole->panel->base); @@ -103,12 +110,12 @@ struct DjuiConsole* djui_console_create(void) { struct DjuiConsole* console = calloc(1, sizeof(struct DjuiConsole)); struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(CONSOLE, CONSOLE)); - djui_three_panel_set_body_size(panel, 750); + djui_three_panel_set_body_size(panel, 1000); console->panel = panel; djui_base_set_alignment(&panel->base, DJUI_HALIGN_CENTER, DJUI_VALIGN_CENTER); djui_base_set_size_type(&panel->base, DJUI_SVT_ABSOLUTE, DJUI_SVT_ABSOLUTE); - djui_base_set_size(&panel->base, 850, 750 + (32 + 16) + 32 + 32); + djui_base_set_size(&panel->base, 850, 1000); djui_base_set_visible(&panel->base, false); djui_interactable_create(&panel->base, NULL);