[vlc-commits] qml: remove unused size change transition in ArtistTopBanner

Pierre Lamot git at videolan.org
Fri Sep 6 18:02:04 CEST 2019


vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Sep  6 15:38:42 2019 +0200| [39259ab36b20f221aff171d6ce2ed9bbf8fa31a2] | committer: Jean-Baptiste Kempf

qml: remove unused size change transition in ArtistTopBanner

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

 modules/gui/qt/qml/mediacenter/ArtistTopBanner.qml | 49 ++--------------------
 modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml  |  1 -
 2 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/modules/gui/qt/qml/mediacenter/ArtistTopBanner.qml b/modules/gui/qt/qml/mediacenter/ArtistTopBanner.qml
index b91d7b7b91..03ac8842a7 100644
--- a/modules/gui/qt/qml/mediacenter/ArtistTopBanner.qml
+++ b/modules/gui/qt/qml/mediacenter/ArtistTopBanner.qml
@@ -27,24 +27,12 @@ import "qrc:///style/"
 
 Rectangle {
     id: root
-    property var artist: undefined
-    onArtistChanged: {
-        if (artist != undefined) {
-            artistImage.source = artist.cover || VLCStyle.noArtArtist
-            artistName.text = artist.name
-        }
-        else {
-            artistImage.source = VLCStyle.noArtArtist
-            artistName.text = ""
-        }
-    }
+    property var artist: ({})
 
     color: VLCStyle.colors.bg
 
-    property int contentY: 0
     height: VLCStyle.heightBar_xlarge
 
-
     Rectangle {
         id: artistImageContainer
         color: VLCStyle.colors.banner
@@ -61,7 +49,7 @@ Rectangle {
 
         Image {
             id: artistImage
-            source: VLCStyle.noArtArtist
+            source: artist.cover || VLCStyle.noArtArtist
             fillMode: Image.PreserveAspectCrop
             anchors.fill: parent
         }
@@ -78,7 +66,7 @@ Rectangle {
 
     Text {
         id: artistName
-        text: ""
+        text: artist.name || qsTr("No artist")
 
         anchors {
             verticalCenter: parent.verticalCenter
@@ -94,35 +82,4 @@ Rectangle {
         elide: Text.ElideRight
         color: VLCStyle.colors.text
     }
-
-
-    states: [
-        State {
-            name: "full"
-            PropertyChanges {
-                target: artistImageContainer
-                width: VLCStyle.cover_small
-                height: VLCStyle.cover_small
-            }
-            PropertyChanges {
-                target: artistName
-                font.pixelSize: VLCStyle.fontSize_xxxlarge
-            }
-            when: contentY < VLCStyle.heightBar_large
-        },
-        State {
-            name: "small"
-            PropertyChanges {
-                target: artistImageContainer
-                width: VLCStyle.icon_normal
-                height: VLCStyle.icon_normal
-            }
-            PropertyChanges {
-                target: artistName
-                font.pixelSize: VLCStyle.fontSize_large
-                anchors.leftMargin: VLCStyle.margin_small
-            }
-            when: contentY >= VLCStyle.heightBar_large
-        }
-    ]
 }
diff --git a/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml b/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml
index 807c9402d5..e34ce3a213 100644
--- a/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml
+++ b/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml
@@ -114,7 +114,6 @@ Utils.NavigableFocusScope {
                         model: videosDelegate
                         modelCount: videosDelegate.items.count
 
-                        headerHeight: VLCStyle.fontSize_xxlarge + VLCStyle.margin_large * 2
                         headerDelegate: Utils.LabelSeparator {
                             id: videosSeparator
                             width: videosGV.width



More information about the vlc-commits mailing list