qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-18 23:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

[console] Fix console sliding and resize

Browse source 
Due to the changes related to console views, the console was either
fully visible or not at all visible, so it took several seconds to
disappear whenever closed.

Taking the screen data from the event fixes the console size being out
due to screen_view updating after the app_window event fires. Really,
this makes it independent of the order.
This commit is contained in:
Bill Currie 2022-09-28 21:57:10 +09:00
parent 60e712f224
commit ba9a071b1c
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libs/console/client.c
View file

@ -524,12 +524,12 @@ resize_console_text (view_t *view)
int width = view->xlen / 8;
int height = view->ylen / 8;
ClearNotify ();
if (console_buffer->width != width || console_buffer->height != height) {
con_linewidth = width;
Draw_DestroyBuffer (console_buffer);
console_buffer = Draw_CreateBuffer (width, height);
clear_console_text ();
}
}
static void
@ -568,7 +568,7 @@ draw_console (view_t *view)
alpha = min (alpha, 255);
}
// draw the background
r_funcs->Draw_ConsoleBackground (view->ylen, alpha);
r_funcs->Draw_ConsoleBackground (con_data.lines, alpha);
// draw everything else
view_draw (view);
@ -640,6 +640,11 @@ C_DrawConsole (void)
{
setup_console ();
int ypos = con_data.lines - con_data.screen_view->ylen;
if (console_view->ypos != ypos) {
view_move (console_view, 0, ypos);
}
say_line.view->visible = con_state == con_message ? !chat_team : 0;
team_line.view->visible = con_state == con_message ? chat_team : 0;
console_view->visible = con_data.lines != 0;
@ -692,8 +697,7 @@ con_app_window (const IE_event_t *event)
old_xlen = event->app_window.xlen;
old_ylen = event->app_window.ylen;
view_resize (con_data.view, con_data.screen_view->xlen,
con_data.screen_view->ylen);
view_resize (con_data.view, old_xlen, old_ylen);
}
}
@ -780,6 +784,9 @@ static int
con_event_handler (const IE_event_t *ie_event, void *data)
{
if (con_state == con_menu) {
if (ie_event->type == ie_app_window) {
con_app_window (ie_event);
}
return Menu_EventHandler (ie_event);
}
static void (*handlers[ie_event_count]) (const IE_event_t *ie_event) = {