Skip to content

Commit 8e24f01

Browse files
committed
fix: keep backspace out of global back handling
1 parent 2770704 commit 8e24f01

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

‎qml/primitives/InputKeys.qml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ QtObject {
1717
|| (includeBrowserBack !== false && key === Qt.Key_BrowserBack)
1818
}
1919

20-
function isBackEvent(event) {
20+
function isBackEvent(event, includeBackspace, includeBrowserBack) {
2121
const scanCode = Number(event.nativeScanCode || 0)
2222
const virtualKey = Number(event.nativeVirtualKey || 0)
2323
const key = Number(event.key || 0)
24-
return isBack(event.key)
24+
return isBack(event.key, includeBackspace === true, includeBrowserBack)
2525
|| event.key === 0x01200003
2626
|| key === 461
2727
|| scanCode === 420

‎src/app/AppController.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <QDebug>
1919
#include <QJsonArray>
2020
#include <QStringList>
21+
#include <QTimer>
2122
#include <QVariantMap>
2223

2324
#include <algorithm>
@@ -1044,7 +1045,7 @@ void AppController::back()
10441045
}
10451046

10461047
qInfo() << "app: quitting";
1047-
QCoreApplication::quit();
1048+
QTimer::singleShot(0, QCoreApplication::instance(), &QCoreApplication::quit);
10481049
}
10491050

10501051
void AppController::shutdown()

0 commit comments

Comments
 (0)