qt: Handle Android back key in the Node window

hebasto · hebasto · commit a56a1049380b · 2021-12-03T01:03:30.000+02:00
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -14,6 +14,7 @@
 #include <netbase.h>
 #include <qt/bantablemodel.h>
 #include <qt/clientmodel.h>
+#include <qt/guiutil.h>
 #include <qt/peertablesortproxy.h>
 #include <qt/platformstyle.h>
 #include <qt/walletmodel.h>
@@ -910,8 +911,7 @@ void RPCConsole::clear(bool keep_prompt)
 
 void RPCConsole::keyPressEvent(QKeyEvent *event)
 {
-    if(windowType() != Qt::Widget && event->key() == Qt::Key_Escape)
-    {
+    if (windowType() != Qt::Widget && GUIUtil::IsEscapeOrBack(event->key())) {
         close();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`#include <netbase.h>`
`15`	`15`	`#include <qt/bantablemodel.h>`
`16`	`16`	`#include <qt/clientmodel.h>`
	`17`	`+#include <qt/guiutil.h>`
`17`	`18`	`#include <qt/peertablesortproxy.h>`
`18`	`19`	`#include <qt/platformstyle.h>`
`19`	`20`	`#include <qt/walletmodel.h>`
`@@ -910,8 +911,7 @@ void RPCConsole::clear(bool keep_prompt)`
`910`	`911`
`911`	`912`	`void RPCConsole::keyPressEvent(QKeyEvent *event)`
`912`	`913`	`{`
`913`		`- if(windowType() != Qt::Widget && event->key() == Qt::Key_Escape)`
`914`		`- {`
	`914`	`+ if (windowType() != Qt::Widget && GUIUtil::IsEscapeOrBack(event->key())) {`
`915`	`915`	`close();`
`916`	`916`	`}`
`917`	`917`	`}`