diff --git a/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml b/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml index 01a0b4977d02961b3857bab7c52312c4b949554e..77ed2786f9d4476e70c836974c6efb20d99a48f4 100644 --- a/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml +++ b/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml @@ -248,6 +248,8 @@ FocusScope { // To get blur effect while scrolling in mainview displayMarginEnd: g_mainDisplay.displayMargin + fadingEdge.enableEndFade: (g_mainDisplay.hasMiniPlayer === false) + Navigation.parentItem: root Navigation.rightAction: function() { diff --git a/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml index f40b309095ceafe54694f817933f9a87cd4d1133..02ed4ff314e35802f36d19c144eb1f684432da12 100644 --- a/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml +++ b/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml @@ -84,6 +84,8 @@ FocusScope { // To get blur effect while scrolling in mainview displayMarginEnd: g_mainDisplay.displayMargin + + fadingEdge.enableEndFade: (g_mainDisplay.hasMiniPlayer === false) } Widgets.EmptyLabelButton { diff --git a/modules/gui/qt/network/qml/BrowseDeviceView.qml b/modules/gui/qt/network/qml/BrowseDeviceView.qml index 2bf41f6a807bb8a238f05529ddbba56258606012..bbb1deacc2939b8c69e824b676e2538ade7beaaf 100644 --- a/modules/gui/qt/network/qml/BrowseDeviceView.qml +++ b/modules/gui/qt/network/qml/BrowseDeviceView.qml @@ -55,6 +55,10 @@ FocusScope { readonly property bool hasGridListMode: true + // NOTE: Currently only respected by the table view: + property bool enableBeginningFade: true + property bool enableEndFade: true + property Component header: Widgets.ViewHeader { view: root @@ -287,6 +291,9 @@ FocusScope { displayMarginEnd: root.displayMarginEnd + fadingEdge.enableBeginningFade: root.enableBeginningFade + fadingEdge.enableEndFade: root.enableEndFade + model: root.model sortModel: (availableRowWidth < VLCStyle.colWidth(4)) ? _modelSmall diff --git a/modules/gui/qt/network/qml/BrowseDisplay.qml b/modules/gui/qt/network/qml/BrowseDisplay.qml index 548e805621a7c3fa2f7d81f04c669efeb8cd7c01..5e3abbccc36a3eb1b72bd57aebc3bb40698c7256 100644 --- a/modules/gui/qt/network/qml/BrowseDisplay.qml +++ b/modules/gui/qt/network/qml/BrowseDisplay.qml @@ -103,6 +103,8 @@ Widgets.PageLoader { displayMarginEnd: g_mainDisplay.displayMargin + enableEndFade: (g_mainDisplay.hasMiniPlayer === false) + model: StandardPathModel { sortCriteria: MainCtx.sort.criteria sortOrder: MainCtx.sort.order @@ -131,6 +133,8 @@ Widgets.PageLoader { displayMarginEnd: g_mainDisplay.displayMargin + enableEndFade: (g_mainDisplay.hasMiniPlayer === false) + model: NetworkDeviceModel { ctx: MainCtx diff --git a/modules/gui/qt/network/qml/DiscoverUrlDisplay.qml b/modules/gui/qt/network/qml/DiscoverUrlDisplay.qml index 3b179694e5dbc1472ef3840260233de695fd667b..7aeccb20fbdbef401f00b02136b7fb39220b1308 100644 --- a/modules/gui/qt/network/qml/DiscoverUrlDisplay.qml +++ b/modules/gui/qt/network/qml/DiscoverUrlDisplay.qml @@ -43,6 +43,11 @@ FocusScope { property int leftPadding: 0 property int rightPadding: 0 + property int displayMarginEnd: g_mainDisplay.displayMargin + + property bool enableBeginningFade: true + property bool enableEndFade: (g_mainDisplay.hasMiniPlayer === false) + //--------------------------------------------------------------------------------------------- // Functions //--------------------------------------------------------------------------------------------- @@ -117,6 +122,11 @@ FocusScope { return root.rightPadding }) + item.displayMarginEnd = Qt.binding(() => { return root.displayMarginEnd }) + + item.fadingEdge.enableBeginningFade = Qt.binding(() => { return root.enableBeginningFade }) + item.fadingEdge.enableEndFade = Qt.binding(() => { return root.enableEndFade }) + item.Navigation.upItem = searchField item.Navigation.parentItem = root diff --git a/modules/gui/qt/network/qml/ServicesManage.qml b/modules/gui/qt/network/qml/ServicesManage.qml index ef337b40663e74df33365810a6faa60284add919..4b08fba202a45be9de9781212832c45b7651ca86 100644 --- a/modules/gui/qt/network/qml/ServicesManage.qml +++ b/modules/gui/qt/network/qml/ServicesManage.qml @@ -69,6 +69,8 @@ Widgets.ListViewExt { // To get blur effect while scrolling in mainview displayMarginEnd: g_mainDisplay.displayMargin + fadingEdge.enableEndFade: (g_mainDisplay.hasMiniPlayer === false) + delegate: Rectangle { width: servicesView.width - VLCStyle.margin_large * 2 height: row.implicitHeight + VLCStyle.margin_small * 2