From c9becabced57f660d82694f49d72ca6840995e9e Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Sun, 29 Nov 2020 21:10:10 +0800
Subject: [PATCH 1/3] fix the overlap in iOS music view

---
 src/components/remotecontrol/remotecontrol.css | 10 ++++++++++
 src/controllers/playback/queue/index.html      |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/remotecontrol/remotecontrol.css b/src/components/remotecontrol/remotecontrol.css
index d0d47f580e..9356da0d0f 100644
--- a/src/components/remotecontrol/remotecontrol.css
+++ b/src/components/remotecontrol/remotecontrol.css
@@ -10,6 +10,8 @@
     -webkit-box-direction: normal;
     -webkit-flex-direction: row;
     flex-direction: row;
+    -webkit-flex-shrink: 0;
+    flex-shrink: 0;
 }
 
 .navigationSection {
@@ -51,6 +53,12 @@
     display: flex;
 }
 
+.infoContainer,
+.sliderContainer {
+    -webkit-flex-shrink: 0;
+    flex-shrink: 0;
+}
+
 .nowPlayingInfoContainerMedia {
     text-align: left;
     margin-bottom: 1em;
@@ -75,6 +83,8 @@
     align-items: center;
     -webkit-flex-wrap: wrap;
     flex-wrap: wrap;
+    -webkit-flex-shrink: 0;
+    flex-shrink: 0;
 }
 
 .nowPlayingInfoControls,
diff --git a/src/controllers/playback/queue/index.html b/src/controllers/playback/queue/index.html
index f38f9cd010..d946af4329 100644
--- a/src/controllers/playback/queue/index.html
+++ b/src/controllers/playback/queue/index.html
@@ -6,7 +6,7 @@
             <div class="nowPlayingPageImageContainer"></div>
             <div class="nowPlayingInfoControls">
 
-                <div class="flex">
+                <div class="infoContainer flex">
 
                     <div class="nowPlayingInfoContainerMedia">
                         <h2 class="nowPlayingPageTitle"></h2>

From eb915cefcf118efa47412b18371dc113f29145e3 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Sun, 29 Nov 2020 22:33:56 +0800
Subject: [PATCH 2/3] fix nowPlayingBar is still hidden after exiting the music
 control pannel

---
 src/components/nowPlayingBar/nowPlayingBar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
index be8895ca6a..992c73a543 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.js
+++ b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -660,7 +660,7 @@ import { appRouter } from '../appRouter';
         console.debug('nowplaying event: ' + event.type);
         const player = this;
 
-        if (!state.NowPlayingItem || layoutManager.tv || !state.IsFullscreen) {
+        if (!state.NowPlayingItem || layoutManager.tv) {
             hideNowPlayingBar();
             return;
         }

From c74a4307b60ea0d2acca84c108749abe80bd605b Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Mon, 30 Nov 2020 18:03:36 +0800
Subject: [PATCH 3/3] Apply suggestions from code review

Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>
---
 src/components/nowPlayingBar/nowPlayingBar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
index 992c73a543..2613b5a855 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.js
+++ b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -660,7 +660,7 @@ import { appRouter } from '../appRouter';
         console.debug('nowplaying event: ' + event.type);
         const player = this;
 
-        if (!state.NowPlayingItem || layoutManager.tv) {
+        if (!state.NowPlayingItem || layoutManager.tv || state.IsFullscreen === false) {
             hideNowPlayingBar();
             return;
         }