[vlc-commits] qml: remove isMiniPlayer property

[Prince Gupta]

vlc | branch: master | Prince Gupta <guptaprince8832 at gmail.com> | Tue Feb  9 18:53:04 2021 +0530| [dfae6fd20883f32ef3d0d94186d007e7633b7021] | committer: Pierre Lamot

qml: remove isMiniPlayer property

Signed-off-by: Pierre Lamot <pierre at videolabs.io>

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

 modules/gui/qt/player/qml/ControlButtons.qml      | 11 ++++-------
 modules/gui/qt/player/qml/MiniPlayer.qml          |  2 --
 modules/gui/qt/player/qml/PlayerButtonsLayout.qml |  2 --
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/modules/gui/qt/player/qml/ControlButtons.qml b/modules/gui/qt/player/qml/ControlButtons.qml
index d961d1f53c..21c7d317b5 100644
--- a/modules/gui/qt/player/qml/ControlButtons.qml
+++ b/modules/gui/qt/player/qml/ControlButtons.qml
@@ -30,7 +30,6 @@ import "qrc:///util/KeyHelper.js" as KeyHelper
 Item{
     id: controlButtons
 
-    property bool isMiniplayer: false
     property var  parentWindow: undefined
 
     signal requestLockUnlockAutoHide(bool lock, var source)
@@ -156,7 +155,7 @@ Item{
             width: VLCStyle.icon_medium
             height: width
 
-            property bool isOpaque: !isMiniplayer
+            property bool isOpaque: history.current.view === "player"
 
             property VLCColors colors: VLCStyle.colors
             property color color: isOpaque ? colors.buttonText : "#303030"
@@ -778,12 +777,10 @@ Item{
             iconText: VLCIcons.fullscreen
 
             onClicked: {
-                if (isMiniplayer) {
-                    g_mainDisplay.showPlayer()
-                }
-                else {
+                if (history.current.view === "player")
                     history.previous()
-                }
+                else
+                    g_mainDisplay.showPlayer()
             }
 
             property bool acceptFocus: true
diff --git a/modules/gui/qt/player/qml/MiniPlayer.qml b/modules/gui/qt/player/qml/MiniPlayer.qml
index 398d22cae4..697cf286a0 100644
--- a/modules/gui/qt/player/qml/MiniPlayer.qml
+++ b/modules/gui/qt/player/qml/MiniPlayer.qml
@@ -117,8 +117,6 @@ Widgets.NavigableFocusScope {
                 models: [miniPlayerModel_left, miniPlayerModel_center, miniPlayerModel_right]
 
                 navigationUpItem: progressBar.enabled ? progressBar : root.navigationUpItem
-
-                isMiniplayer: true
             }
 
             PlayerControlBarModel {
diff --git a/modules/gui/qt/player/qml/PlayerButtonsLayout.qml b/modules/gui/qt/player/qml/PlayerButtonsLayout.qml
index ec531b5494..b6016988cd 100644
--- a/modules/gui/qt/player/qml/PlayerButtonsLayout.qml
+++ b/modules/gui/qt/player/qml/PlayerButtonsLayout.qml
@@ -28,7 +28,6 @@ Widgets.NavigableFocusScope {
 
     implicitHeight: Math.max(buttonrow_left.implicitHeight, buttonrow_center.implicitHeight, buttonrow_right.implicitHeight)
 
-    property alias isMiniplayer: controlmodelbuttons.isMiniplayer
     property alias parentWindow: controlmodelbuttons.parentWindow
 
     property real marginLeft: VLCStyle.margin_normal
@@ -66,7 +65,6 @@ Widgets.NavigableFocusScope {
     ControlButtons {
         id: controlmodelbuttons
 
-        isMiniplayer: false
         parentWindow: g_root
 
         onRequestLockUnlockAutoHide: playerButtonsLayout.requestLockUnlockAutoHide(lock, source)