EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-05-31 16:18:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

global escape

Browse Source 
Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-10-04 18:19:02 +08:00
parent 2aa9b46433
commit aa356b5376
2 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
lib/main.dart
View File

@@ -264,38 +264,46 @@ class MyApp extends StatelessWidget {
child: child!, child: child!,
); );
if (Utils.isDesktop) { if (Utils.isDesktop) {
return MouseBackDetector( void onBack() {
onTapDown: () { if (SmartDialog.checkExist()) {
if (SmartDialog.checkExist()) { SmartDialog.dismiss();
SmartDialog.dismiss(); return;
return; }
}
if (Get.isDialogOpen ?? Get.isBottomSheetOpen ?? false) {
Get.back();
return;
}
final plCtr = PlPlayerController.instance;
if (plCtr != null) {
if (plCtr.isFullScreen.value == true) {
plCtr
..triggerFullScreen(status: false)
..controlsLock.value = false;
return;
}
if (plCtr.isDesktopPip) {
plCtr.exitDesktopPip().whenComplete(
() => plCtr.initialFocalPoint = Offset.zero,
);
return;
}
}
if (Get.isDialogOpen ?? Get.isBottomSheetOpen ?? false) {
Get.back(); Get.back();
return;
}
final plCtr = PlPlayerController.instance;
if (plCtr != null) {
if (plCtr.isFullScreen.value == true) {
plCtr
..triggerFullScreen(status: false)
..controlsLock.value = false;
return;
}
if (plCtr.isDesktopPip) {
plCtr.exitDesktopPip().whenComplete(
() => plCtr.initialFocalPoint = Offset.zero,
);
return;
}
}
Get.back();
}
return Shortcuts(
shortcuts: {
LogicalKeySet(LogicalKeyboardKey.escape):
VoidCallbackIntent(onBack),
}, },
child: child, child: MouseBackDetector(
onTapDown: onBack,
child: child,
),
); );
} }
return child; return child;

12
lib/pages/video/widgets/player_focus.dart
View File

@@ -163,18 +163,6 @@ class PlayerFocus extends StatelessWidget {
..controlsLock.value = false; ..controlsLock.value = false;
return true; return true;
case LogicalKeyboardKey.escape:
if (plPlayerController.controlsLock.value) {
plPlayerController.onLockControl(false);
} else if (plPlayerController.isDesktopPip) {
plPlayerController.exitDesktopPip();
} else if (isFullScreen) {
plPlayerController.triggerFullScreen(status: false);
} else {
Get.back();
}
return true;
case LogicalKeyboardKey.keyD: case LogicalKeyboardKey.keyD:
if (plPlayerController.isLive) { if (plPlayerController.isLive) {
final newVal = !plPlayerController.enableShowLiveDanmaku.value; final newVal = !plPlayerController.enableShowLiveDanmaku.value;