qml: change cancel behavior in player

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
7 years ago · 308369494d
1 changed files with 7 additions and 3 deletions
--- a/modules/gui/qt/player/qml/Player.qml
+++ b/modules/gui/qt/player/qml/Player.qml
@ -61,10 +61,14 @@ Widgets.NavigableFocusScope {
    }

    navigationCancel: function() {
-        if (player.hasVideoOutput) {
-           mainPlaylistController.stop()
+        if (rootWindow.hasEmbededVideo && controlBarView.state === "visible") {
+            toolbarAutoHide._setVisibleControlBar(false)
+        } else {
+            if (player.hasVideoOutput) {
+               mainPlaylistController.stop()
+            }
+            history.previous()
        }
-        history.previous()
    }

    //property alias centralLayout: mainLayout.centralLayout