Merge pull request #3308

5848aee Navbar: cleanup layout (xiphon)
This commit is contained in:
luigi1111 2021-01-22 15:09:07 -05:00
commit c1573c2c2a
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 9 additions and 16 deletions

View file

@ -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
}
}
}
}

View file

@ -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