From 3fd99f464aef514d90e787d0ed02113d4257bc12 Mon Sep 17 00:00:00 2001 From: Arkadiusz Fal Date: Sat, 6 Jul 2024 13:39:10 +0200 Subject: [PATCH] Revert change to OSD positions --- Shared/Player/Controls/PlayerControls.swift | 18 +++++++----------- .../Player/Controls/PlayerControlsLayout.swift | 4 ++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Shared/Player/Controls/PlayerControls.swift b/Shared/Player/Controls/PlayerControls.swift index ea215b94..05d2c6e3 100644 --- a/Shared/Player/Controls/PlayerControls.swift +++ b/Shared/Player/Controls/PlayerControls.swift @@ -75,20 +75,16 @@ struct PlayerControls: View { } VStack { - Spacer() ZStack { - GeometryReader { geometry in - VStack(spacing: 0) { - ZStack { - OpeningStream() - NetworkState() - } + VStack(spacing: 0) { + ZStack { + OpeningStream() + NetworkState() } - .position( - x: geometry.size.width / 2, - y: geometry.size.height / 2 - ) + + Spacer() } + .offset(y: playerControlsLayout.osdVerticalOffset + 5) if showControls { Section { diff --git a/Shared/Player/Controls/PlayerControlsLayout.swift b/Shared/Player/Controls/PlayerControlsLayout.swift index b92bd516..0392995b 100644 --- a/Shared/Player/Controls/PlayerControlsLayout.swift +++ b/Shared/Player/Controls/PlayerControlsLayout.swift @@ -277,6 +277,10 @@ enum PlayerControlsLayout: String, CaseIterable, Defaults.Serializable { } } + var osdVerticalOffset: Double { + buttonSize + } + var osdProgressBarHeight: Double { switch self { case .tvRegular: