From 76a18645f72f8a6b26d0f41e366123c94b5d5c93 Mon Sep 17 00:00:00 2001 From: Fatih Uzunoglu <fuzun54@outlook.com> Date: Thu, 10 Apr 2025 22:57:26 +0300 Subject: [PATCH 1/6] qml: expose `enable{Beginning,End}Fade` in `BrowseDeviceView.qml` --- modules/gui/qt/network/qml/BrowseDeviceView.qml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/gui/qt/network/qml/BrowseDeviceView.qml b/modules/gui/qt/network/qml/BrowseDeviceView.qml index 2bf41f6a807..bbb1deacc29 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 -- GitLab From c81bbeacc6757bc821554fb3380a1750ca1a2612 Mon Sep 17 00:00:00 2001 From: Fatih Uzunoglu <fuzun54@outlook.com> Date: Thu, 10 Apr 2025 22:57:55 +0300 Subject: [PATCH 2/6] qml: disable end fade if mini player is visible in `BrowseDisplay.qml` --- modules/gui/qt/network/qml/BrowseDisplay.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/gui/qt/network/qml/BrowseDisplay.qml b/modules/gui/qt/network/qml/BrowseDisplay.qml index 548e805621a..5e3abbccc36 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 -- GitLab From 30618a32d651fae83826c88d13957ba4a06b4788 Mon Sep 17 00:00:00 2001 From: Fatih Uzunoglu <fuzun54@outlook.com> Date: Thu, 10 Apr 2025 23:01:48 +0300 Subject: [PATCH 3/6] qml: disable end fade if mini player is visible in `DiscoverUrlDisplay.qml` and set missing display margin end. --- modules/gui/qt/network/qml/DiscoverUrlDisplay.qml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/gui/qt/network/qml/DiscoverUrlDisplay.qml b/modules/gui/qt/network/qml/DiscoverUrlDisplay.qml index 3b179694e5d..7aeccb20fbd 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 -- GitLab From deca75fe07646974ef466acc8e8c0027f4cfc1d2 Mon Sep 17 00:00:00 2001 From: Fatih Uzunoglu <fuzun54@outlook.com> Date: Thu, 10 Apr 2025 23:02:10 +0300 Subject: [PATCH 4/6] qml: disable end fade if mini player is visible in `MusicArtistsAlbums.qml` --- modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml b/modules/gui/qt/medialibrary/qml/MusicArtistsAlbums.qml index 01a0b4977d0..77ed2786f9d 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() { -- GitLab From c617869b67e818f1c06e03a17e34117adb51ae0c Mon Sep 17 00:00:00 2001 From: Fatih Uzunoglu <fuzun54@outlook.com> Date: Thu, 10 Apr 2025 23:02:23 +0300 Subject: [PATCH 5/6] qml: disable end fade if mini player is visible in `MusicTracksDisplay.qml` --- modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml index f40b309095c..02ed4ff314e 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 { -- GitLab From a259a9abbdc5ce5f07c10afd5787db65e3c122a6 Mon Sep 17 00:00:00 2001 From: Fatih Uzunoglu <fuzun54@outlook.com> Date: Thu, 10 Apr 2025 23:02:29 +0300 Subject: [PATCH 6/6] qml: disable end fade if mini player is visible in `ServicesManage.qml` --- modules/gui/qt/network/qml/ServicesManage.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/gui/qt/network/qml/ServicesManage.qml b/modules/gui/qt/network/qml/ServicesManage.qml index ef337b40663..4b08fba202a 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 -- GitLab