[vlc-commits] qml: rearrange items in TopBar

[Prince Gupta]

vlc | branch: master | Prince Gupta <guptaprince8832 at gmail.com> | Tue Jan 12 20:08:14 2021 +0530| [cb6fa09c7c7f59c00beafd71d113253b70889708] | committer: Pierre Lamot

qml: rearrange items in TopBar

Signed-off-by: Pierre Lamot <pierre at videolabs.io>

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

 modules/gui/qt/player/qml/TopBar.qml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt/player/qml/TopBar.qml b/modules/gui/qt/player/qml/TopBar.qml
index 3d5fce5ca7..509e8fca3e 100644
--- a/modules/gui/qt/player/qml/TopBar.qml
+++ b/modules/gui/qt/player/qml/TopBar.qml
@@ -69,13 +69,14 @@ Widgets.NavigableFocusScope{
             RowLayout {
                 id: rowLayout
                 anchors.fill: parent
+                anchors.leftMargin: VLCStyle.margin_xxsmall
 
                 Column{
                     id: backAndTitleLayout
                     Layout.fillWidth: true
                     Layout.alignment: Qt.AlignTop | Qt.AlignLeft
 
-                    spacing: 0
+                    spacing: VLCStyle.margin_large
 
                     Menus.Menubar {
                         id: menubar
@@ -90,7 +91,7 @@ Widgets.NavigableFocusScope{
 
                     RowLayout {
                         anchors.left: parent.left
-                        spacing: 0
+                        spacing: VLCStyle.margin_xxsmall
 
                         Widgets.IconToolButton {
                             id: backBtn
@@ -98,7 +99,7 @@ Widgets.NavigableFocusScope{
                             Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
 
                             objectName: "IconToolButton"
-                            size: VLCStyle.icon_normal
+                            size: VLCStyle.banner_icon_size
                             iconText: VLCIcons.topbar_previous
                             text: i18n.qtr("Back")
                             color: topFocusScope.colors.playerFg
@@ -112,6 +113,8 @@ Widgets.NavigableFocusScope{
                         }
 
                         Image {
+                            id: logo
+
                             Layout.alignment: Qt.AlignVCenter
                             sourceSize.width: VLCStyle.icon_small
                             sourceSize.height: VLCStyle.icon_small
@@ -124,12 +127,12 @@ Widgets.NavigableFocusScope{
                         id: titleText
 
                         anchors.left: parent.left
-                        anchors.leftMargin: VLCStyle.icon_normal
+                        anchors.leftMargin: logo.x
                         width: rowLayout.width - anchors.leftMargin
 
                         horizontalAlignment: Text.AlignLeft
                         color: topFocusScope.colors.playerFg
-                        font.pixelSize: VLCStyle.fontSize_xxlarge
+                        font.pixelSize: VLCStyle.dp(18, VLCStyle.scale)
                         font.weight: Font.DemiBold
                         textFormat: Text.PlainText
                         elide: Text.ElideRight