From 0c249f00844194de86ad795be2f842c36e8c9e2d Mon Sep 17 00:00:00 2001 From: The Dax Date: Thu, 22 Aug 2013 12:38:04 -0400 Subject: [PATCH] Remove RMB as a default cancel key. We'll let the user bind it to cancel manually. --- Common/KeyMap.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp index e84e7d9cd4..f47f74be7a 100644 --- a/Common/KeyMap.cpp +++ b/Common/KeyMap.cpp @@ -222,11 +222,14 @@ void UpdateConfirmCancelKeys() { cancelKeys.push_back((keycode_t)i->keyCode); } + // Push several hard-coded keys before submitting to native. + if(std::find(cancelKeys.begin(), cancelKeys.end(), NKCODE_ENTER) == cancelKeys.end()) + confirmKeys.push_back(NKCODE_ENTER); + const keycode_t hardcodedCancelKeys[] = { NKCODE_SPACE, NKCODE_ESCAPE, NKCODE_BACK, - NKCODE_EXT_MOUSEBUTTON_2 }; // If they're not already bound, add them in.