[vlc-commits] qml: change cancel behavior in player

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Tue Feb 18 18:06:31 2020 +0100| [308369494d9d9df185a0bf34379ab04fd2da2435] | committer: Jean-Baptiste Kempf

qml: change cancel behavior in player

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

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

 modules/gui/qt/player/qml/Player.qml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt/player/qml/Player.qml b/modules/gui/qt/player/qml/Player.qml
index 9765f16ad0..aa5a4e499d 100644
--- 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