diff --git a/src/qml/ContentView.qml b/src/qml/ContentView.qml --- a/src/qml/ContentView.qml +++ b/src/qml/ContentView.qml @@ -356,12 +356,7 @@ id: playList Layout.fillHeight: true - Layout.leftMargin: !LayoutMirroring.enabled ? elisaTheme.layoutHorizontalMargin : 0 - Layout.rightMargin: LayoutMirroring.enabled ? elisaTheme.layoutHorizontalMargin : 0 - - Layout.minimumWidth: contentZone.width - Layout.maximumWidth: contentZone.width - Layout.preferredWidth: contentZone.width + Layout.fillWidth: true onStartPlayback: elisa.audioControl.ensurePlay() @@ -436,12 +431,6 @@ Layout.maximumWidth: 0 Layout.preferredWidth: 0 } - PropertyChanges { - target: playList - Layout.minimumWidth: contentZone.width * 2 / 5 + elisaTheme.layoutHorizontalMargin - Layout.maximumWidth: contentZone.width * 2 / 5 + elisaTheme.layoutHorizontalMargin - Layout.preferredWidth: contentZone.width * 2 / 5 + elisaTheme.layoutHorizontalMargin - } PropertyChanges { target: viewSeparatorItem Layout.minimumWidth: 1 @@ -487,12 +476,6 @@ Layout.maximumWidth: 1 Layout.preferredWidth: 1 } - PropertyChanges { - target: playList - Layout.minimumWidth: contentZone.width * 0.33 - 3 * elisaTheme.layoutHorizontalMargin + 2 - Layout.maximumWidth: contentZone.width * 0.33 - 3 * elisaTheme.layoutHorizontalMargin + 2 - Layout.preferredWidth: contentZone.width * 0.33 - 3 * elisaTheme.layoutHorizontalMargin + 2 - } PropertyChanges { target: viewSeparatorItem Layout.minimumWidth: 0 diff --git a/src/qml/MediaPlayListView.qml b/src/qml/MediaPlayListView.qml --- a/src/qml/MediaPlayListView.qml +++ b/src/qml/MediaPlayListView.qml @@ -111,12 +111,17 @@ font.pointSize: elisaTheme.defaultFontPointSize * 2 Layout.alignment: Qt.AlignLeft | Qt.AlignTop Layout.topMargin: elisaTheme.layoutVerticalMargin * 3 + Layout.leftMargin: elisaTheme.layoutHorizontalMargin + Layout.rightMargin: elisaTheme.layoutHorizontalMargin } RowLayout { Layout.fillWidth: true + Layout.leftMargin: elisaTheme.layoutHorizontalMargin + Layout.rightMargin: elisaTheme.layoutHorizontalMargin + LabelWithToolTip { id: playListInfo diff --git a/src/qml/PlayListAlbumHeader.qml b/src/qml/PlayListAlbumHeader.qml --- a/src/qml/PlayListAlbumHeader.qml +++ b/src/qml/PlayListAlbumHeader.qml @@ -31,8 +31,12 @@ BasicPlayListAlbumHeader { id: albumHeader - anchors.fill: parent - anchors.topMargin: elisaTheme.layoutVerticalMargin * 1.5 - anchors.bottomMargin: elisaTheme.layoutVerticalMargin * 1.5 + anchors { + fill: parent + topMargin: elisaTheme.layoutVerticalMargin * 1.5 + bottomMargin: elisaTheme.layoutVerticalMargin * 1.5 + leftMargin: elisaTheme.layoutHorizontalMargin + rightMargin: elisaTheme.layoutHorizontalMargin + } } } diff --git a/src/qml/PlayListEntry.qml b/src/qml/PlayListEntry.qml --- a/src/qml/PlayListEntry.qml +++ b/src/qml/PlayListEntry.qml @@ -140,6 +140,7 @@ id: trackRow anchors.fill: parent + anchors.leftMargin: elisaTheme.layoutHorizontalMargin spacing: elisaTheme.layoutHorizontalMargin / 4 @@ -397,8 +398,8 @@ color: myPalette.text Layout.alignment: Qt.AlignVCenter | Qt.AlignRight - Layout.leftMargin: elisaTheme.layoutHorizontalMargin / 2 - Layout.rightMargin: elisaTheme.layoutHorizontalMargin / 2 + Layout.leftMargin: elisaTheme.layoutHorizontalMargin + Layout.rightMargin: elisaTheme.layoutHorizontalMargin horizontalAlignment: Text.AlignRight }