[vlc-commits] qml: remove unused expanderItem in ExpandGridView

Pierre Lamot git at videolan.org
Mon Oct 14 11:59:49 CEST 2019


vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Thu Oct 10 14:03:30 2019 +0200| [304fdc891bef4d6c79eebba8eb7bf73861b3ab71] | committer: Jean-Baptiste Kempf

qml: remove unused expanderItem in ExpandGridView

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

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

 modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml | 2 +-
 modules/gui/qt/qml/utils/ExpandGridView.qml       | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml b/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml
index 1ee788336b..7075078f2a 100644
--- a/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml
+++ b/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml
@@ -66,7 +66,7 @@ Utils.NavigableFocusScope {
             enabled: medialib.gridView
             text: "Information"
             onTriggered: {
-                view.currentItem.switchExpandItem(contextMenu.model.index, view.currentItem.currentItem)
+                view.currentItem.switchExpandItem(contextMenu.model.index)
             }
         }
         Utils.MenuItemExt {
diff --git a/modules/gui/qt/qml/utils/ExpandGridView.qml b/modules/gui/qt/qml/utils/ExpandGridView.qml
index 9280a119fb..268133ad33 100644
--- a/modules/gui/qt/qml/utils/ExpandGridView.qml
+++ b/modules/gui/qt/qml/utils/ExpandGridView.qml
@@ -47,7 +47,6 @@ NavigableFocusScope {
     //delegate to display the extended item
     property Component delegate: Item{}
     property Component expandDelegate: Item{}
-    property Item expanderItem: Item{}
 
     property Component headerDelegate: Item{}
     property int headerHeight: headerItemLoader.implicitHeight
@@ -63,10 +62,7 @@ NavigableFocusScope {
         flickable.layout()
     }
 
-    function switchExpandItem(index,item) {
-        if (item)
-            root.expanderItem = item
-
+    function switchExpandItem(index) {
         if (index === _expandIndex)
             _newExpandIndex = -1
         else



More information about the vlc-commits mailing list