diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 9fa20c4653c20cf53187c48fc7324808ca322209..f85c9a337ada106e47a442a3a6f403b69864c1ea 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -642,7 +642,7 @@ libqt_plugin_la_QML = \
gui/qt/qml/mediacenter/MusicTrackListDisplay.qml \
gui/qt/qml/mediacenter/NetworkGridItem.qml \
gui/qt/qml/mediacenter/NetworkListItem.qml \
- gui/qt/qml/mediacenter/VideoExpandableGrid.qml \
+ gui/qt/qml/mediacenter/VideoInfoExpandPanel.qml \
gui/qt/qml/mediacenter/VideoGridItem.qml \
gui/qt/qml/playlist/PlaylistListView.qml \
gui/qt/qml/playlist/PlaylistMainView.qml \
diff --git a/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml b/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml
index dcddf07513381fb43c2fccc5468d4786058557be..cad09b0afc9ef93864090efffa6d1e750ced9741 100644
--- a/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml
+++ b/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml
@@ -106,7 +106,7 @@ Utils.NavigableFocusScope {
Component {
id: gridComponent
- VideoExpandableGrid {
+ Utils.ExpandGridView {
id: videosGV
property Item currentItem: Item{}
@@ -137,6 +137,21 @@ Utils.NavigableFocusScope {
}
}
+ expandDelegate: VideoInfoExpandPanel {
+ visible: !videosGV.isAnimating
+
+ height: implicitHeight
+ width: videosGV.width
+
+ onRetract: videosGV.retract()
+ notchPosition: videosGV.getItemPos(videosGV._expandIndex)[0] + (videosGV.cellWidth / 2)
+
+ navigationParent: videosGV
+ navigationCancel: function() { videosGV.retract() }
+ navigationUp: function() { videosGV.retract() }
+ navigationDown: function() { videosGV.retract() }
+ }
+
navigationParent: root
/*
@@ -150,6 +165,12 @@ Utils.NavigableFocusScope {
}
}
+ cellWidth: (VLCStyle.video_normal_width)
+ cellHeight: (VLCStyle.video_normal_height) + VLCStyle.margin_xlarge + VLCStyle.margin_normal
+
+ onSelectAll: videosGV.model.selectAll()
+ onSelectionUpdated: videosGV.model.updateSelection( keyModifiers, oldIndex, newIndex )
+ onActionAtIndex: switchExpandItem( index )
}
}
diff --git a/modules/gui/qt/qml/mediacenter/VideoExpandableGrid.qml b/modules/gui/qt/qml/mediacenter/VideoInfoExpandPanel.qml
similarity index 90%
rename from modules/gui/qt/qml/mediacenter/VideoExpandableGrid.qml
rename to modules/gui/qt/qml/mediacenter/VideoInfoExpandPanel.qml
index fe7188aeeae7878ff23eb89ad06041cc2a830201..6ae73b647af02e8da824958189a38d30a1b5c6dd 100644
--- a/modules/gui/qt/qml/mediacenter/VideoExpandableGrid.qml
+++ b/modules/gui/qt/qml/mediacenter/VideoInfoExpandPanel.qml
@@ -23,36 +23,24 @@ import QtQuick.Layouts 1.3
import org.videolan.medialib 0.1
import "qrc:///utils/" as Utils
-import "qrc:///dialogs/" as DG
import "qrc:///style/"
-Utils.ExpandGridView {
- id: expandableGV
-
- activeFocusOnTab:true
-
- expandDelegate: Utils.NavigableFocusScope {
+Utils.NavigableFocusScope {
id: expandRect
+
property int currentId: -1
property var model : ({})
property alias currentItemY: expandRect.y
property alias currentItemHeight: expandRect.height
- height: implicitHeight
- implicitHeight: arrowRect.implicitHeight
- + contentRect.implicitHeight
- width: expandableGV.width
-
- navigationParent: expandableGV
- navigationCancel: function() { expandableGV.retract() }
- navigationUp: function() { expandableGV.retract() }
- navigationDown: function() { expandableGV.retract() }
+ implicitHeight: arrowRect.implicitHeight + contentRect.implicitHeight
+ property int notchPosition: 0
+ signal retract()
//arrow
Item {
id:arrowRect
y: -(width/2)
- x: expandableGV.getItemPos(expandableGV._expandIndex)[0] + (expandableGV.cellWidth / 2) - (width/2)
- visible: !expandableGV.isAnimating
+ x: notchPosition - (width/2)
clip: true
width: Math.sqrt(2) *VLCStyle.icon_normal
height: width/2
@@ -77,7 +65,6 @@ Utils.ExpandGridView {
width: parent.width
clip: true
color: VLCStyle.colors.bgAlt
- visible: !expandableGV.isAnimating
RowLayout {
id: contentLayout
@@ -276,7 +263,7 @@ Utils.ExpandGridView {
color: VLCStyle.colors.lightText
focus: true
- onClicked: expandableGV.retract()
+ onClicked: expandRect.retract()
}
Keys.priority: Keys.AfterItem
@@ -287,13 +274,3 @@ Utils.ExpandGridView {
}
}
}
-
-
- cellWidth: (VLCStyle.video_normal_width)
- cellHeight: (VLCStyle.video_normal_height) + VLCStyle.margin_xlarge + VLCStyle.margin_normal
-
- onSelectAll: expandableGV.model.selectAll()
- onSelectionUpdated: expandableGV.model.updateSelection( keyModifiers, oldIndex, newIndex )
- onActionAtIndex: switchExpandItem( index )
-
-}
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index daf12bd2f5bca716f9ebbc3728ccb2460a95e40a..52c9600aa401b5892c87e76751d5cc0f26ae8be6 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -224,7 +224,7 @@
<file alias="MCMainDisplay.qml">qml/mediacenter/MCMainDisplay.qml</file>
<file alias="NetworkGridItem.qml">qml/mediacenter/NetworkGridItem.qml</file>
<file alias="NetworkListItem.qml">qml/mediacenter/NetworkListItem.qml</file>
- <file alias="VideoExpandableGrid.qml">qml/mediacenter/VideoExpandableGrid.qml</file>
+ <file alias="VideoInfoExpandPanel.qml">qml/mediacenter/VideoInfoExpandPanel.qml</file>
<file alias="MCVideoListDisplay.qml">qml/mediacenter/MCVideoListDisplay.qml</file>
<file alias="VideoGridItem.qml">qml/mediacenter/VideoGridItem.qml</file>
<file alias="AudioGridItem.qml">qml/mediacenter/AudioGridItem.qml</file>