diff --git a/src/qml/ContentView.qml b/src/qml/ContentView.qml --- a/src/qml/ContentView.qml +++ b/src/qml/ContentView.qml @@ -361,7 +361,8 @@ id: playList Layout.fillHeight: true - Layout.leftMargin: elisaTheme.layoutHorizontalMargin + Layout.leftMargin: !LayoutMirroring.enabled ? elisaTheme.layoutHorizontalMargin : 0 + Layout.rightMargin: LayoutMirroring.enabled ? elisaTheme.layoutHorizontalMargin : 0 Layout.minimumWidth: contentZone.width Layout.maximumWidth: contentZone.width @@ -416,7 +417,8 @@ Layout.minimumWidth: 0 Layout.maximumWidth: 0 Layout.preferredWidth: 0 - Layout.leftMargin: elisaTheme.layoutHorizontalMargin * 1.5 + Layout.leftMargin: !LayoutMirroring.enabled ? elisaTheme.layoutHorizontalMargin * 1.5 : 0 + Layout.rightMargin: LayoutMirroring.enabled ? elisaTheme.layoutHorizontalMargin * 1.5 : 0 visible: Layout.minimumWidth != 0 } diff --git a/src/qml/ContextView.qml b/src/qml/ContextView.qml --- a/src/qml/ContextView.qml +++ b/src/qml/ContextView.qml @@ -73,14 +73,12 @@ Layout.fillWidth: true Layout.maximumHeight: elisaTheme.contextCoverImageSize Layout.preferredHeight: elisaTheme.contextCoverImageSize + Layout.maximumWidth: topItem.width Layout.bottomMargin: elisaTheme.layoutVerticalMargin - width: elisaTheme.contextCoverImageSize - height: elisaTheme.contextCoverImageSize - - sourceSize.width: parent.width - sourceSize.height: elisaTheme.contextCoverImageSize + sourceSize.width: topItem.width + sourceSize.height: topItem.width asynchronous: true @@ -95,8 +93,8 @@ Layout.alignment: Qt.AlignLeft | Qt.AlignTop Layout.topMargin: elisaTheme.layoutVerticalMargin - - elide: Text.ElideRight + Layout.fillWidth: true + Layout.maximumWidth: topItem.width } LabelWithToolTip { @@ -110,8 +108,8 @@ Layout.alignment: Qt.AlignLeft | Qt.AlignTop Layout.bottomMargin: elisaTheme.layoutVerticalMargin - - elide: Text.ElideRight + Layout.fillWidth: true + Layout.maximumWidth: topItem.width } LabelWithToolTip { @@ -125,8 +123,8 @@ Layout.alignment: Qt.AlignLeft | Qt.AlignTop Layout.bottomMargin: elisaTheme.layoutVerticalMargin - - elide: Text.ElideRight + Layout.fillWidth: true + Layout.maximumWidth: topItem.width } LabelWithToolTip { @@ -140,8 +138,8 @@ Layout.alignment: Qt.AlignLeft | Qt.AlignTop Layout.bottomMargin: elisaTheme.layoutVerticalMargin - - elide: Text.ElideRight + Layout.fillWidth: true + Layout.maximumWidth: topItem.width } Flickable { @@ -190,10 +188,11 @@ } } - Row { + RowLayout { Layout.alignment: Qt.AlignLeft | Qt.AlignBottom Layout.topMargin: elisaTheme.layoutVerticalMargin Layout.bottomMargin: elisaTheme.layoutVerticalMargin + Layout.maximumWidth: topItem.width spacing: elisaTheme.layoutHorizontalMargin @@ -207,9 +206,11 @@ LabelWithToolTip { id: fileNameLabel + Layout.fillWidth: true + text: fileUrl - elide: Text.ElideRight + elide: Text.ElideLeft } } } diff --git a/src/qml/LabelWithToolTip.qml b/src/qml/LabelWithToolTip.qml --- a/src/qml/LabelWithToolTip.qml +++ b/src/qml/LabelWithToolTip.qml @@ -25,6 +25,8 @@ horizontalAlignment: Text.AlignLeft + elide: Text.ElideRight + Loader { anchors.fill: parent