[vlc-commits] qml: only load the ScanProgressBar when the medialib is active

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Oct  9 10:06:21 2020 +0200| [d380a3eb618428be07e62ab3ca77075e394cf2f2] | committer: Pierre Lamot

qml: only load the ScanProgressBar when the medialib is active

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

 modules/gui/qt/medialibrary/qml/MainDisplay.qml | 6 +++++-
 modules/gui/qt/widgets/qml/ScanProgressBar.qml  | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt/medialibrary/qml/MainDisplay.qml b/modules/gui/qt/medialibrary/qml/MainDisplay.qml
index 696eaa5216..20538fc6bb 100644
--- a/modules/gui/qt/medialibrary/qml/MainDisplay.qml
+++ b/modules/gui/qt/medialibrary/qml/MainDisplay.qml
@@ -200,7 +200,7 @@ Widgets.NavigableFocusScope {
                             leftMargin: VLCStyle.applicationHorizontalMargin
                         }
 
-                        Widgets.ScanProgressBar {
+                        Loader {
                             z: 1
                             anchors {
                                 left: parent.left
@@ -208,7 +208,11 @@ Widgets.NavigableFocusScope {
                                 bottom: parent.bottom
                                 rightMargin: VLCStyle.margin_small
                                 leftMargin: VLCStyle.margin_small
+                                topMargin: VLCStyle.dp(10, VLCStyle.scale)
+                                bottomMargin: VLCStyle.dp(10, VLCStyle.scale)
                             }
+                            active: !!medialib
+                            source: "qrc:///widgets/ScanProgressBar.qml"
                         }
                     }
 
diff --git a/modules/gui/qt/widgets/qml/ScanProgressBar.qml b/modules/gui/qt/widgets/qml/ScanProgressBar.qml
index 977a58d4cd..26a7fa9ead 100644
--- a/modules/gui/qt/widgets/qml/ScanProgressBar.qml
+++ b/modules/gui/qt/widgets/qml/ScanProgressBar.qml
@@ -28,8 +28,6 @@ T.ProgressBar {
     from: 0
     to: 100
     height: progressText_id.height
-    anchors.topMargin: 10
-    anchors.bottomMargin: 10
     value: medialib.parsingProgress
     indeterminate: medialib.discoveryPending