Make the /chart and F4 dialogs closable via Escape

legacyclonk · Sep 17, 2019 · d6b1353 · d6b1353
1 parent 140903f
commit d6b1353
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/C4Network2Dialogs.cpp b/src/C4Network2Dialogs.cpp
@@ -428,6 +428,20 @@ void C4Network2ClientListBox::Update()
 
 // C4Network2ClientListDlg
 
+namespace
+{
+	C4KeyBinding* registerStrongerEscape(C4GUI::Dialog* dialog)
+	{
+		C4CustomKey::CodeList keys;
+		keys.push_back(C4KeyCodeEx(K_ESCAPE));
+		if (Config.Controls.GamepadGuiControl)
+		{
+			keys.push_back(C4KeyCodeEx(KEY_Gamepad(0, KEY_JOY_AnyHighButton)));
+		}
+		return new C4KeyBinding(keys, "GUIDialogAbort", KEYSCOPE_Fullscreen, new C4GUI::DlgKeyCB<C4GUI::Dialog>(*dialog, &C4GUI::Dialog::KeyEscape), C4CustomKey::PRIO_Dlg);
+	}
+}
+
 // singleton
 C4Network2ClientListDlg *C4Network2ClientListDlg::pInstance = nullptr;
 
@@ -450,6 +464,8 @@ C4Network2ClientListDlg::C4Network2ClientListDlg()
 	AddElement(pListBox = new C4Network2ClientListBox(caAll.GetAll(), false));
 	// create status label
 	AddElement(pStatusLabel = new C4GUI::Label("", rcStatus));
+
+	keyEscape.reset(registerStrongerEscape(this));
 	// add timer
 	pSec1Timer = new C4Sec1TimerCallback<C4Network2ClientListDlg>(this);
 	// initial update
@@ -894,6 +910,8 @@ C4ChartDialog::C4ChartDialog() : Dialog(DialogWidth, DialogHeight, LoadResStr("I
 		AddChart(StdStrBuf("Pings"));
 	AddChart(StdStrBuf("Control"));
 	AddChart(StdStrBuf("APM"));
+
+	keyEscape.reset(registerStrongerEscape(this));
 }
 
 void C4ChartDialog::AddChart(const StdStrBuf &rszName)

diff --git a/src/C4Network2Dialogs.h b/src/C4Network2Dialogs.h
@@ -24,6 +24,8 @@
 #include "C4Scenario.h"
 #include "C4Network2Res.h"
 
+#include <memory>
+
 // dialog showing info about a connected client
 class C4Network2ClientDlg : public C4GUI::InfoDialog
 {
@@ -167,6 +169,7 @@ class C4Network2ClientListBox : public C4GUI::ListBox
 class C4Network2ClientListDlg : public C4GUI::Dialog
 {
 private:
+	std::unique_ptr<C4KeyBinding> keyEscape;
 	C4Sec1TimerCallback<C4Network2ClientListDlg> *pSec1Timer; // engine timer hook for updates
 	class C4GameOptionsList *pGameOptions;
 	C4GUI::Label *pStatusLabel;
@@ -253,6 +256,7 @@ class C4ChartDialog : public C4GUI::Dialog
 {
 private:
 	C4GUI::Tabular *pChartTabular;
+	std::unique_ptr<C4KeyBinding> keyEscape;
 
 	// singleton-stuff
 	static C4ChartDialog *pChartDlg;