From 651ed474adc28a66c8fd85502714655a6c879ac0 Mon Sep 17 00:00:00 2001 From: terencehill Date: Fri, 11 Mar 2022 00:25:40 +0100 Subject: [PATCH] Allow closing the Welcome dialog with Enter and Space --- qcsrc/menu/xonotic/dialog_welcome.qc | 13 +++++++++++++ qcsrc/menu/xonotic/dialog_welcome.qh | 1 + 2 files changed, 14 insertions(+) diff --git a/qcsrc/menu/xonotic/dialog_welcome.qc b/qcsrc/menu/xonotic/dialog_welcome.qc index bf2a71163..4c3166649 100644 --- a/qcsrc/menu/xonotic/dialog_welcome.qc +++ b/qcsrc/menu/xonotic/dialog_welcome.qc @@ -17,6 +17,19 @@ void welcomeDialog_resetStrings(entity me) strunzone(me.serverinfo_MOTD); me.serverinfo_MOTD = strzone(_("")); } +float XonoticWelcomeDialog_keyDown(entity me, float key, float ascii, float shift) +{ + switch(key) + { + case K_KP_ENTER: + case K_ENTER: + case K_SPACE: + XonoticWelcomeDialog_close(me); + return true; + default: + return SUPER(XonoticWelcomeDialog).keyDown(me, key, ascii, shift); + } +} void XonoticWelcomeDialog_close(entity me) { SUPER(XonoticWelcomeDialog).close(me); diff --git a/qcsrc/menu/xonotic/dialog_welcome.qh b/qcsrc/menu/xonotic/dialog_welcome.qh index 5b4881bcf..a1666ed02 100644 --- a/qcsrc/menu/xonotic/dialog_welcome.qh +++ b/qcsrc/menu/xonotic/dialog_welcome.qh @@ -10,6 +10,7 @@ CLASS(XonoticWelcomeDialog, XonoticRootDialog) ATTRIB(XonoticWelcomeDialog, columns, float, 4); ATTRIB(XonoticWelcomeDialog, name, string, "Welcome"); + METHOD(XonoticWelcomeDialog, keyDown, float(entity, float, float, float)); METHOD(XonoticWelcomeDialog, close, void(entity)); METHOD(XonoticWelcomeDialog, configureDialog, void(entity)); METHOD(XonoticWelcomeDialog, readInputArgs, void(entity, float)); -- 2.39.2