[vlc-commits] qml: don't base MusicTrackListDisplay on MainInterface.MainTableView
Prince Gupta
git at videolan.org
Thu Dec 17 14:57:11 UTC 2020
vlc | branch: master | Prince Gupta <guptaprince8832 at gmail.com> | Fri Dec 4 18:58:56 2020 +0530| [5900e8b148370a27bcbd322c6d0523616afe43b9] | committer: Pierre Lamot
qml: don't base MusicTrackListDisplay on MainInterface.MainTableView
this is used in another places in non Maininterface contexts, directly set MiniPlayerBottomMargin in MusicTracksDisplay
Signed-off-by: Pierre Lamot <pierre at videolabs.io>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5900e8b148370a27bcbd322c6d0523616afe43b9
---
modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml | 3 +--
modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml
index fb5c595a84..89d6955e82 100644
--- a/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml
+++ b/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml
@@ -24,10 +24,9 @@ import org.videolan.medialib 0.1
import "qrc:///util/" as Util
import "qrc:///widgets/" as Widgets
-import "qrc:///main/" as MainInterface
import "qrc:///style/"
-MainInterface.MainTableView {
+Widgets.KeyNavigableTableView {
id: root
property var sortModelSmall: [
diff --git a/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml
index 60eea56383..7f5bea3fb2 100644
--- a/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml
+++ b/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml
@@ -21,6 +21,7 @@ import org.videolan.medialib 0.1
import "qrc:///style/"
import "qrc:///widgets/" as Widgets
+import "qrc:///main/" as MainInterface
Widgets.NavigableFocusScope {
id: root
@@ -62,6 +63,8 @@ Widgets.NavigableFocusScope {
else
tracklistdisplay_id.currentIndex = 0;
}
+ footer: MainInterface.MiniPlayerBottomMargin {
+ }
}
EmptyLabel {
More information about the vlc-commits
mailing list