[vlc-commits] QML: fix the conditional display of the mini-player

[Adrien Maglo]

vlc | branch: master | Adrien Maglo <magsoft at videolan.org> | Mon Jun 17 18:57:47 2019 +0200| [0eb0c45e76d4bafe3c0f18f3f3fa960f3975891b] | committer: Jean-Baptiste Kempf

QML: fix the conditional display of the mini-player

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0eb0c45e76d4bafe3c0f18f3f3fa960f3975891b
---

 modules/gui/qt/qml/MainInterface.qml          |  1 -
 modules/gui/qt/qml/mediacenter/MiniPlayer.qml | 12 +++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt/qml/MainInterface.qml b/modules/gui/qt/qml/MainInterface.qml
index 4fe998795a..bbd72add75 100644
--- a/modules/gui/qt/qml/MainInterface.qml
+++ b/modules/gui/qt/qml/MainInterface.qml
@@ -134,7 +134,6 @@ Rectangle {
                             history.push(["player"], History.Go)
                     }
                     else {
-                        console.log("go previous", history.current.view)
                         if (history.current.view === "player")
                             history.previous(History.Go)
                     }
diff --git a/modules/gui/qt/qml/mediacenter/MiniPlayer.qml b/modules/gui/qt/qml/mediacenter/MiniPlayer.qml
index aeb8e40c17..b302b53063 100644
--- a/modules/gui/qt/qml/mediacenter/MiniPlayer.qml
+++ b/modules/gui/qt/qml/mediacenter/MiniPlayer.qml
@@ -13,18 +13,20 @@ Utils.NavigableFocusScope {
 
     Layout.fillWidth: true
 
-    height: player.playingState === PlayerController.PLAYING_STATE_STOPPED ? 0 : root.childrenRect.height
-
+    Component.onCompleted : {
+        if (player.playingState === PlayerController.PLAYING_STATE_STOPPED)
+            root.implicitHeight = 0;
+        else
+            root.implicitHeight = root.childrenRect.height;
+    }
 
     Connections {
         target: player
         onPlayingStateChanged: {
-            root.height = VLCStyle.miniPlayerHeight
             if (player.playingState === PlayerController.PLAYING_STATE_STOPPED)
                 animateRetract.start()
-            else {
+            else if (player.playingState === PlayerController.PLAYING_STATE_PLAYING)
                 animateExpand.start()
-            }
         }
     }