Minor improvements

Model/Player/PlayerControlsModel.swift

@@ -52,8 +52,9 @@ final class PlayerControlsModel: ObservableObject {
     }
 
     func show() {
+        player.backend.updateControls()
+
         withAnimation(PlayerControls.animation) {
-            player.backend.updateControls()
             presentingControls = true
         }
     }
@@ -65,11 +66,11 @@ final class PlayerControlsModel: ObservableObject {
     }
 
     func toggle() {
-        withAnimation(PlayerControls.animation) {
-            if !presentingControls {
-                player.backend.updateControls()
-            }
+        if !presentingControls {
+            player.backend.updateControls()
+        }
 
+        withAnimation(PlayerControls.animation) {
             presentingControls.toggle()
         }
     }

Model/Player/PlayerModel.swift

@@ -300,6 +300,9 @@ final class PlayerModel: ObservableObject {
     }
 
     private func handleNavigationViewPlayerPresentationChange() {
+        backend.setNeedsDrawing(playerNavigationLinkActive)
+        controls.hide()
+
         if pauseOnHidingPlayer, !playingInPictureInPicture, !playerNavigationLinkActive {
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                 self.pause()

Shared/Player/Controls/PlayerControls.swift

@@ -2,7 +2,7 @@ import Foundation
 import SwiftUI
 
 struct PlayerControls: View {
-    static let animation = Animation.easeInOut(duration: 0)
+    static let animation = Animation.easeInOut(duration: 0.2)
 
     private var player: PlayerModel!
 
@@ -60,12 +60,8 @@ struct PlayerControls: View {
     }
 
     var controlsBackground: some View {
-        model.presentingControls ?
-            AnyView(
-                PlayerGestures()
-                    .background(Color.black.opacity(0.5))
-            ) :
-            AnyView(Color.clear)
+        PlayerGestures()
+            .background(Color.black.opacity(model.presentingControls ? 0.5 : 0))
     }
 
     var timeline: some View {
@@ -145,7 +141,7 @@ struct PlayerControls: View {
         HStack {
             fullscreenButton
             Spacer()
-            button("Music Mode", systemImage: "music.note")
+//            button("Music Mode", systemImage: "music.note")
         }
     }
 

Shared/Player/MPV/MPVOGLView.swift

@@ -33,14 +33,14 @@ final class MPVOGLView: GLKView {
         glClear(UInt32(GL_COLOR_BUFFER_BIT))
     }
 
-    override func draw(_: CGRect) {
+    override func draw(_ rect: CGRect) {
         glGetIntegerv(UInt32(GL_FRAMEBUFFER_BINDING), &defaultFBO!)
 
         if mpvGL != nil {
             var data = mpv_opengl_fbo(
                 fbo: Int32(defaultFBO!),
-                w: Int32(bounds.size.width) * Int32(contentScaleFactor),
-                h: Int32(bounds.size.height) * Int32(contentScaleFactor),
+                w: Int32(rect.size.width) * Int32(contentScaleFactor),
+                h: Int32(rect.size.height) * Int32(contentScaleFactor),
                 internal_format: 0
             )
             var flip: CInt = 1

Shared/Player/VideoPlayerView.swift

@@ -114,6 +114,7 @@ struct VideoPlayerView: View {
                                                 Color.clear
                                                     .onAppear {
                                                         player.playerSize = proxy.size
+                                                        // TODO move to backend method
                                                         player.mpvBackend.client?.setSize(proxy.size.width, proxy.size.height)
                                                     }
                                                     .onChange(of: proxy.size) { _ in