From: otta8634 <k9wolf@pm.me>
Date: Sat, 15 Feb 2025 11:18:28 +0000 (+0800)
Subject: Add an OK exit button to the guide dialog
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=71aac004f449c6a385385f1fbe81bf1bc03cba9e;p=xonotic%2Fxonotic-data.pk3dir.git

Add an OK exit button to the guide dialog

This makes it much easier to exit, rather than having to press Esc or the tiny x.
This is also done in the mutators and other dialogs.
---

diff --git a/qcsrc/menu/xonotic/dialog_singleplayer_guide.qc b/qcsrc/menu/xonotic/dialog_singleplayer_guide.qc
index abd9d3abf8..0d4cae1567 100644
--- a/qcsrc/menu/xonotic/dialog_singleplayer_guide.qc
+++ b/qcsrc/menu/xonotic/dialog_singleplayer_guide.qc
@@ -12,7 +12,7 @@ void XonoticGuideDialog_fill(entity me)
 	me.gotoRC(me, 0, col);
 		me.TD(me, 1, width, makeXonoticHeaderLabel(_("Topic")));
 	me.TR(me);
-		me.TD(me, me.rows - 1, width, e = me.topicList);
+		me.TD(me, me.rows - 2, width, e = me.topicList);
 			e.onChange = XonoticGuideDialog_topicChangeNotify;
 			e.onChangeEntity = me;
 
@@ -20,10 +20,10 @@ void XonoticGuideDialog_fill(entity me)
 	me.gotoRC(me, 0, col); me.setFirstColumn(me, me.currentColumn);
 		me.TD(me, 1, width, makeXonoticHeaderLabel(_("Entry")));
 	me.TR(me);
-		me.TD(me, me.rows - 1 - 1, width, e = me.entryList);
+		me.TD(me, me.rows - 3, width, e = me.entryList);
 			e.onChange = XonoticGuideDialog_entryChangeNotify;
 			e.onChangeEntity = me;
-	me.gotoRC(me, me.rows - 1, col);
+	me.gotoRC(me, me.rows - 2, col);
 		me.entryList.stringFilterBox = makeXonoticInputBox_T(false, string_null,
 			_("Click here or Ctrl-F to provide a keyword to narrow down the map list. Ctrl-Delete to clear; Enter when done."));
 		me.TD(me, 1, 0.3, makeXonoticTextLabel(0, _("Filter:")));
@@ -36,7 +36,12 @@ void XonoticGuideDialog_fill(entity me)
 	me.gotoRC(me, 0, col); me.setFirstColumn(me, me.currentColumn);
 		me.TD(me, 1, width, makeXonoticHeaderLabel(_("Description")));
 	me.TR(me);
-		me.TD(me, me.rows - 1, width, me.descriptionPane);
+		me.TD(me, me.rows - 2, width, me.descriptionPane);
+
+	me.gotoRC(me, me.rows - 1, 0);
+		me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));
+			e.onClick = Dialog_Close;
+			e.onClickEntity = me;
 
 	me.topicChangeNotify(me.topicList, me);
 }