Merge pull request #3308

5848aee Navbar: cleanup layout (xiphon)

2 files changed, 9 insertions, 16 deletions

diff --git a/pages/settings/Navbar.qml b/pages/settings/Navbar.qml
index 0d83fd7d..87c37dcd 100644
--- a/pages/settings/Navbar.qml
+++ b/pages/settings/Navbar.qml
@@ -39,19 +39,14 @@ import "."
 import moneroComponents.Clipboard 1.0
 
 Rectangle {
-    Layout.fillWidth: true
-    Layout.preferredHeight: 96
     color: "transparent"
-
-    ColumnLayout {
-        spacing: 0
-        Layout.preferredHeight: 32
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.horizontalCenter: parent.horizontalCenter
+    height: grid.height
+    width: grid.width
 
         GridLayout {
             id: grid
-            Layout.alignment: Qt.AlignHCenter
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.horizontalCenter: parent.horizontalCenter
             columnSpacing: 0
             property string fontColorActive: MoneroComponents.Style.blackTheme ? "white" : "white"
             property string fontColorInActive: MoneroComponents.Style.blackTheme ? "white" : MoneroComponents.Style.dimmedFontColor
@@ -413,11 +408,5 @@ Rectangle {
                     }
                 }
             }
-
-            Rectangle {
-                color: "transparent"
-                Layout.fillWidth: true
-            }
         }
-    }
 }
diff --git a/pages/settings/Settings.qml b/pages/settings/Settings.qml
index c0c09d1a..ae6d682f 100644
--- a/pages/settings/Settings.qml
+++ b/pages/settings/Settings.qml
@@ -48,7 +48,11 @@ ColumnLayout {
     property int settingsHeight: 900
     property alias settingsStateViewState: settingsStateView.state
 
-    Navbar{}
+    Navbar {
+        Layout.alignment: Qt.AlignHCenter
+        Layout.topMargin: height
+        Layout.bottomMargin: height
+    }
 
     Rectangle{
         id: settingsStateView