[vlc-commits] [Git][videolan/vlc][master] 2 commits: qml: properly align item if secondary label is missing

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
53306589 by Leon Vitanos at 2022-06-26T11:36:14+00:00
qml: properly align item if secondary label is missing

fix: #26353

- - - - -
b7fe7d66 by Leon Vitanos at 2022-06-26T11:36:14+00:00
qml: hide the "vlc://nop" for node/directory items

fix: #26354

- - - - -


2 changed files:

- modules/gui/qt/network/qml/NetworkGridItem.qml
- modules/gui/qt/widgets/qml/GridItem.qml


Changes:

=====================================
modules/gui/qt/network/qml/NetworkGridItem.qml
=====================================
@@ -42,8 +42,16 @@ Widgets.GridItem {
 
     image: model.artwork && model.artwork.toString() !== "" ? model.artwork : ""
 
-    subtitle: model.mrl || ""
     title: model.name || I18n.qtr("Unknown share")
+    subtitle: {
+       if (!model.mrl) {
+         return ""
+       } else if ((model.type === NetworkMediaModel.TYPE_NODE || model.type === NetworkMediaModel.TYPE_DIRECTORY) && model.mrl.toString() === "vlc://nop") {
+         return ""
+      } else {
+         return model.mrl
+      }
+    }
 
     pictureOverlay: NetworkCustomCover {
         networkModel: model


=====================================
modules/gui/qt/widgets/qml/GridItem.qml
=====================================
@@ -249,7 +249,8 @@ T.Control {
         ColumnLayout {
             id: layout
 
-            anchors.centerIn: parent
+            anchors.top: parent.top
+            anchors.horizontalCenter: parent.horizontalCenter
             spacing: 0
 
             Widgets.MediaCover {



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/47b039033d66d16b69e11b53cea82017417f766e...b7fe7d66f0307b8c57d638469cd5a96fd14e4915

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


VideoLAN code repository instance