EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-05-27 11:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: show Controls progress bar during drag instead of full overlay

Browse Source
This commit is contained in:
систем
2026-04-10 21:51:03 +08:00
parent e40a72f8c9
commit 18ecda3379
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/plugin/pl_player/controller.dart
View File

@@ -1667,6 +1667,7 @@ class PlPlayerController with BlockConfigMixin {
late final Map<String, ui.Image?> previewCache = {}; late final Map<String, ui.Image?> previewCache = {};
LoadingState<VideoShotData>? videoShot; LoadingState<VideoShotData>? videoShot;
final RxBool isDraggingProgress = false.obs;
late final RxBool showPreview = false.obs; late final RxBool showPreview = false.obs;
late final showSeekPreview = Pref.showSeekPreview; late final showSeekPreview = Pref.showSeekPreview;
late final previewIndex = RxnInt(); late final previewIndex = RxnInt();

15
lib/plugin/pl_player/view/view.dart
View File

@@ -145,7 +145,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
late FullScreenMode mode; late FullScreenMode mode;
late final RxBool showRestoreScaleBtn = false.obs; late final RxBool showRestoreScaleBtn = false.obs;
final RxBool _isDraggingProgress = false.obs;
GestureType? _gestureType; GestureType? _gestureType;
@@ -977,7 +977,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
final dy = cumulativeDelta.dy.abs(); final dy = cumulativeDelta.dy.abs();
if (dx > 3 * dy) { if (dx > 3 * dy) {
_gestureType = GestureType.horizontal; _gestureType = GestureType.horizontal;
_isDraggingProgress.value = true; plPlayerController.isDraggingProgress.value = true;
} else if (dy > 3 * dx) { } else if (dy > 3 * dx) {
if (!plPlayerController.enableSlideVolumeBrightness && if (!plPlayerController.enableSlideVolumeBrightness &&
!plPlayerController.enableSlideFS) { !plPlayerController.enableSlideFS) {
@@ -1128,7 +1128,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
} }
void _onInteractionEnd(ScaleEndDetails details) { void _onInteractionEnd(ScaleEndDetails details) {
_isDraggingProgress.value = false; plPlayerController.isDraggingProgress.value = false;
if (plPlayerController.showSeekPreview) { if (plPlayerController.showSeekPreview) {
plPlayerController.showPreview.value = false; plPlayerController.showPreview.value = false;
} }
@@ -1286,7 +1286,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
final dy = pan.dy.abs(); final dy = pan.dy.abs();
if (dx > 3 * dy) { if (dx > 3 * dy) {
_gestureType = GestureType.horizontal; _gestureType = GestureType.horizontal;
_isDraggingProgress.value = true; plPlayerController.isDraggingProgress.value = true;
} else if (dy > 3 * dx) { } else if (dy > 3 * dx) {
_gestureType = GestureType.right; _gestureType = GestureType.right;
} }
@@ -1340,7 +1340,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
} }
void _onPointerPanZoomEnd(PointerPanZoomEndEvent event) { void _onPointerPanZoomEnd(PointerPanZoomEndEvent event) {
_isDraggingProgress.value = false; plPlayerController.isDraggingProgress.value = false;
_gestureType = null; _gestureType = null;
} }
@@ -1728,10 +1728,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
child: Obx( child: Obx(
() { () {
final showControls = plPlayerController.showControls.value; final showControls = plPlayerController.showControls.value;
final isDragging = _isDraggingProgress.value; final offstage = switch (plPlayerController.progressType) {
final offstage = isDragging
? false
: switch (plPlayerController.progressType) {
BtmProgressBehavior.onlyShowFullScreen => BtmProgressBehavior.onlyShowFullScreen =>
showControls || !isFullScreen, showControls || !isFullScreen,
BtmProgressBehavior.onlyHideFullScreen => BtmProgressBehavior.onlyHideFullScreen =>

3
lib/plugin/pl_player/widgets/bottom_control.dart
View File

@@ -65,7 +65,8 @@ class BottomControl extends StatelessWidget {
padding: const EdgeInsets.fromLTRB(10, 0, 10, 7), padding: const EdgeInsets.fromLTRB(10, 0, 10, 7),
child: Obx( child: Obx(
() => Offstage( () => Offstage(
offstage: !controller.showControls.value, offstage: !controller.showControls.value &&
!controller.isDraggingProgress.value,
child: Stack( child: Stack(
clipBehavior: Clip.none, clipBehavior: Clip.none,
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,