feat(pip): enhance Picture-in-Picture functionality with improved state management and window styling

emp0ry · emp0ry · commit 4d498913f3ee · 2026-05-29T14:34:45.000+04:00
diff --git a/lib/features/player/application/playback_controller.dart b/lib/features/player/application/playback_controller.dart
@@ -167,6 +167,9 @@ class PlaybackController extends Notifier<PlaybackState> {
   int _playbackGeneration = 0;
   final Set<String> _autoFallbackTriedServers = <String>{};
   int _seekPreviewGeneration = 0;
+  // Incremented by dismissUndoSkip(); skipTo() checks this before publishing
+  // lastSkippedFrom so that a dismiss racing an in-flight seek wins.
+  int _undoSkipGeneration = 0;
   int _manualSeekEpoch = 0;
   Duration _resumeGuardPosition = Duration.zero;
   DateTime? _resumeGuardUntil;
@@ -1721,6 +1724,7 @@ class PlaybackController extends Notifier<PlaybackState> {
       target,
       engine.state.value.duration,
     );
+    final int gen = _undoSkipGeneration;
     _manualSeekEpoch++;
     _clearInteractiveSeek();
     _setSeekPreview(engine, clampedTarget);
@@ -1732,12 +1736,16 @@ class PlaybackController extends Notifier<PlaybackState> {
     if (state.engine == engine) {
       _beginSeekSettle(engine, clampedTarget);
     }
-    state = state.copyWith(lastSkippedFrom: from);
-    _undoTimer?.cancel();
-    _undoTimer = Timer(
-      const Duration(seconds: 5),
-      () => state = state.copyWith(clearLastSkippedFrom: true),
-    );
+    // Only publish the undo position if dismissUndoSkip() wasn't called while
+    // the seek was in flight (generation mismatch means the dismiss won).
+    if (gen == _undoSkipGeneration) {
+      state = state.copyWith(lastSkippedFrom: from);
+      _undoTimer?.cancel();
+      _undoTimer = Timer(
+        const Duration(seconds: 5),
+        () => state = state.copyWith(clearLastSkippedFrom: true),
+      );
+    }
   }
 
   Future<void> undoSkip() async {
@@ -1811,6 +1819,12 @@ class PlaybackController extends Notifier<PlaybackState> {
 
   void dismissAutoNext() => state = state.copyWith(autoNextVisible: false);
 
+  void dismissUndoSkip() {
+    _undoSkipGeneration++;
+    _undoTimer?.cancel();
+    state = state.copyWith(clearLastSkippedFrom: true);
+  }
+
   Future<void> _saveProgress(
     MediaPlaybackItem item,
     PlayerEngine engine,
diff --git a/lib/features/player/presentation/player_page.dart b/lib/features/player/presentation/player_page.dart
@@ -102,6 +102,9 @@ class _PlayerPageState extends ConsumerState<PlayerPage> {
       setState(() => _inPipMode = inPip);
       if (inPip) {
         _hideControls();
+      } else {
+        // Auto-skips that fired while the UI was hidden are no longer relevant.
+        ref.read(playbackControllerProvider.notifier).dismissUndoSkip();
       }
     });
     // Initialise from current PiP state in case we're opened while already in PiP.
@@ -777,39 +780,8 @@ class _PlayerPageState extends ConsumerState<PlayerPage> {
                       Positioned.fill(
                         child: _NativePipOverlay(onCancel: () {}),
                       ),
-                    // Desktop PiP overlay: drag strip (Windows frameless) +
-                    // expand button to exit PiP mode.
-                    if (_inPipMode && !_isMobile) ...<Widget>[
-                      if (defaultTargetPlatform == TargetPlatform.windows)
-                        Positioned(
-                          top: 0,
-                          left: 0,
-                          right: 0,
-                          height: 28,
-                          child: IgnorePointer(
-                            child: Container(
-                              alignment: Alignment.center,
-                              decoration: BoxDecoration(
-                                gradient: LinearGradient(
-                                  begin: Alignment.topCenter,
-                                  end: Alignment.bottomCenter,
-                                  colors: <Color>[
-                                    Colors.black54,
-                                    Colors.transparent,
-                                  ],
-                                ),
-                              ),
-                              child: Container(
-                                width: 32,
-                                height: 4,
-                                decoration: BoxDecoration(
-                                  color: Colors.white38,
-                                  borderRadius: BorderRadius.circular(2),
-                                ),
-                              ),
-                            ),
-                          ),
-                        ),
+                    // Desktop PiP overlay: expand button to exit PiP mode.
+                    if (_inPipMode && !_isMobile)
                       Positioned(
                         right: 6,
                         bottom: 6,
@@ -827,7 +799,6 @@ class _PlayerPageState extends ConsumerState<PlayerPage> {
                           ),
                         ),
                       ),
-                    ],
                   ],
                 ),
               ),
diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp
@@ -133,15 +133,21 @@ void FlutterWindow::SetupPipChannel() {
           }
 
           if (!is_pip_) {
-            pip_saved_style_ = GetWindowLongPtr(hwnd, GWL_STYLE);
             pip_saved_placement_.length = sizeof(WINDOWPLACEMENT);
             GetWindowPlacement(hwnd, &pip_saved_placement_);
           }
 
-          // Size the PiP window to ~380 px wide, height from aspect ratio.
-          const int pip_w = 380;
-          const int pip_h =
-              static_cast<int>(pip_w / aspect_ratio + 0.5);
+          // Keep the existing window style (title bar stays) to avoid
+          // triggering a D3D surface rebuild that corrupts the FVP renderer.
+          // Only the size, position, and z-order change.
+          const LONG_PTR cur_style = GetWindowLongPtr(hwnd, GWL_STYLE);
+
+          // Compute the window rect that gives the desired client video area.
+          // AdjustWindowRect accounts for title bar + borders in cur_style.
+          RECT wr{0, 0, 380, static_cast<LONG>(380.0 / aspect_ratio + 0.5)};
+          AdjustWindowRect(&wr, static_cast<DWORD>(cur_style), FALSE);
+          const int pip_w = wr.right - wr.left;
+          const int pip_h = wr.bottom - wr.top;
 
           // Position at bottom-right of the monitor work area.
           MONITORINFO mi{sizeof(mi)};
@@ -151,10 +157,8 @@ void FlutterWindow::SetupPipChannel() {
           const int pip_x = mi.rcWork.right - pip_w - kMargin;
           const int pip_y = mi.rcWork.bottom - pip_h - kMargin;
 
-          // Borderless with a thin resize frame (no title bar).
-          SetWindowLongPtr(hwnd, GWL_STYLE, WS_POPUP | WS_THICKFRAME);
           SetWindowPos(hwnd, HWND_TOPMOST, pip_x, pip_y, pip_w, pip_h,
-                       SWP_NOOWNERZORDER | SWP_FRAMECHANGED | SWP_SHOWWINDOW);
+                       SWP_NOOWNERZORDER | SWP_SHOWWINDOW);
           is_pip_ = true;
 
           if (pip_channel_) {
@@ -168,11 +172,10 @@ void FlutterWindow::SetupPipChannel() {
                    call.method_name() == "exit") {
           if (is_pip_) {
             is_pip_ = false;
-            SetWindowLongPtr(hwnd, GWL_STYLE, pip_saved_style_);
             SetWindowPlacement(hwnd, &pip_saved_placement_);
             SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0,
                          SWP_NOMOVE | SWP_NOSIZE | SWP_NOOWNERZORDER |
-                             SWP_FRAMECHANGED | SWP_SHOWWINDOW);
+                             SWP_SHOWWINDOW);
             SetForegroundWindow(hwnd);
 
             if (pip_channel_) {
@@ -209,17 +212,6 @@ LRESULT
 FlutterWindow::MessageHandler(HWND hwnd, UINT const message,
                               WPARAM const wparam,
                               LPARAM const lparam) noexcept {
-  // In PiP mode the top 28 px acts as a drag strip so the frameless window
-  // can still be moved by the user.  Handle this before Flutter sees it.
-  if (message == WM_NCHITTEST && is_pip_) {
-    const int py = static_cast<int>(static_cast<short>(HIWORD(lparam)));
-    RECT rc;
-    GetWindowRect(hwnd, &rc);
-    if (py < rc.top + 28) {
-      return HTCAPTION;
-    }
-  }
-
   switch (message) {
     case WM_CLOSE:
       if (!is_pip_) SaveWindowGeometry(hwnd);
diff --git a/windows/runner/flutter_window.h b/windows/runner/flutter_window.h
@@ -50,7 +50,6 @@ class FlutterWindow : public Win32Window {
 
   // PiP state.
   bool is_pip_ = false;
-  LONG_PTR pip_saved_style_ = 0;
   WINDOWPLACEMENT pip_saved_placement_{};
 };
 
