Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-10-30 08:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Block the player dismiss pan from starting on side sliders

Browse Source 
The window-level dismiss pan recognizes before SwiftUI's slider
DragGesture sets isAdjustingPlayerSliders, so dragging volume or
brightness often dismissed the player instead. Side sliders now publish
their frames and the pan refuses to begin from touches inside them.
This commit is contained in:
Arkadiusz Fal
2026-10-10 23:58:16 +02:00
parent cf1acb1986
commit 2d3ae1b0e5
3 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Yattee/Views/Player/ExpandedPlayerWindow.swift
View File

@@ -175,6 +175,7 @@ private final class DragToDismissGestureHandler: NSObject, UIGestureRecognizerDe
var getCornerBelowPanelFrame: (() -> CGRect)?
/// Returns the panel resize grabber strip frame in screen coordinates (blocks dismiss pan)
var getPanelResizeGrabberFrame: (() -> CGRect)?
var getPlayerSideSliderFrames: (() -> [CGRect])?
/// Returns whether the portrait panel is currently visible (not hidden off-screen)
var isPortraitPanelVisible: (() -> Bool)?
/// Returns the progress bar frame in screen coordinates (for gesture conflict resolution)
@@ -383,6 +384,13 @@ private final class DragToDismissGestureHandler: NSObject, UIGestureRecognizerDe
return false
}
// ...or when the touch starts on a slider: the flag above is set by
// SwiftUI's DragGesture, which fires after this pan recognizes
let sliderTouch = panGesture.location(in: nil)
if (getPlayerSideSliderFrames?() ?? []).contains(where: { $0.contains(sliderTouch) }) {
return false
}
// Don't begin dismiss gesture when dragging portrait panel
if isPanelDragging?() == true {
return false
@@ -871,6 +879,9 @@ final class ExpandedPlayerWindowManager {
handler.getPanelResizeGrabberFrame = { [weak self] in
self?.appEnvironment?.navigationCoordinator.panelResizeGrabberFrame ?? .zero
}
handler.getPlayerSideSliderFrames = { [weak self] in
self?.appEnvironment?.navigationCoordinator.playerSideSliderFrames.values.filter { !$0.isEmpty } ?? []
}
handler.isPortraitPanelVisible = { [weak self] in
self?.appEnvironment?.navigationCoordinator.isPortraitPanelVisible ?? true
}