GitHub/proxypin
1
0
Fork 0
mirror of https://github.com/wanghongenpin/proxypin.git synced 2026-05-16 15:56:51 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'develop' into flutter-3.19.6

Browse Source
This commit is contained in:
wanghongenpin
2024-11-12 09:29:25 +08:00
parent 772a66c4fb 8738e5643d
commit 98333f5e80
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/network/util/uri.dart
View File

@@ -18,7 +18,7 @@ class UriBuild {
class UriUtils {
//map转url参数
static String mapToQuery(Map<String, dynamic>? map) {
static String mapToQuery(Map? map) {
if (map == null) {
return '';
}

2
lib/ui/desktop/toolbar/setting/request_rewrite.dart
View File

@@ -67,7 +67,7 @@ class RequestRewriteState extends State<RequestRewriteWidget> {
}
bool onKeyEvent(KeyEvent event) {
if (event.logicalKey == LogicalKeyboardKey.escape && Navigator.canPop(context)) {
if (HardwareKeyboard.instance.isLogicalKeyPressed(LogicalKeyboardKey.escape) && Navigator.canPop(context)) {
Navigator.maybePop(context);
return true;
}

5
lib/ui/desktop/toolbar/setting/script.dart
View File

@@ -76,6 +76,11 @@ class _ScriptWidgetState extends State<ScriptWidget> {
}
bool onKeyEvent(KeyEvent event) {
if (HardwareKeyboard.instance.isLogicalKeyPressed(LogicalKeyboardKey.escape) && Navigator.canPop(context)) {
Navigator.maybePop(context);
return true;
}
if ((HardwareKeyboard.instance.isMetaPressed || HardwareKeyboard.instance.isControlPressed) &&
event.logicalKey == LogicalKeyboardKey.keyW) {
HardwareKeyboard.instance.removeHandler(onKeyEvent);