[vlc-commits] [Git][videolan/vlc][master] 3 commits: qml/PlaylistDelegate: correctly set delayRemove

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
d3057bb1 by Prince Gupta at 2021-10-01T17:07:52+00:00
qml/PlaylistDelegate: correctly set delayRemove

fixup 644bfa09f65b0193eadf0585edc025296ac05436

- - - - -
8fb07455 by Prince Gupta at 2021-10-01T17:07:52+00:00
qml/DragItem: fix caption color

- - - - -
f261d474 by Prince Gupta at 2021-10-01T17:07:52+00:00
qml/PlaylistListView: respect maxCovers of DragItem

- - - - -


3 changed files:

- modules/gui/qt/playlist/qml/PlaylistDelegate.qml
- modules/gui/qt/playlist/qml/PlaylistListView.qml
- modules/gui/qt/widgets/qml/DragItem.qml


Changes:

=====================================
modules/gui/qt/playlist/qml/PlaylistDelegate.qml
=====================================
@@ -48,6 +48,8 @@ Control {
 
     rightPadding: Math.max(listView.scrollBarWidth, VLCStyle.margin_normal)
 
+    ListView.delayRemove: mouseArea.drag.active
+
     // Events
 
     onHoveredChanged: {
@@ -240,8 +242,6 @@ Control {
                 {
                     listView.fadeRectTopHovered = Qt.binding(function() {return delegate.hovered})
                 }
-
-                delegate.ListView.delayRemove = drag.active
             }
         }
 


=====================================
modules/gui/qt/playlist/qml/PlaylistListView.qml
=====================================
@@ -121,7 +121,7 @@ Control {
 
         function updateComponents(maxCovers) {
             var count = root.model.selectedCount
-            var selection = root.model.getSelection()
+            var selection = root.model.getSelection().slice(0, maxCovers)
 
             var title = selection.map(function (index){
                 return root.model.itemAt(index).title


=====================================
modules/gui/qt/widgets/qml/DragItem.qml
=====================================
@@ -272,6 +272,7 @@ Item {
             visible: text && text !== ""
             width: parent.width
             text: _model.subtitle || i18n.qtr("%1 selected").arg(_model.count)
+            color: colors.menuCaption
         }
     }
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f7414320b1fe77ed6dd7bfc6392c597563af5667...f261d474bc978875c68464b78b73cd41bd15a3c1

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f7414320b1fe77ed6dd7bfc6392c597563af5667...f261d474bc978875c68464b78b73cd41bd15a3c1
You're receiving this email because of your account on code.videolan.org.