Merge pull request #1660

784ca96 fixed: networkStatus overlaps menu, padding (xiphon)
This commit is contained in:
luigi1111 2018-10-16 18:16:45 -05:00
commit 7615b86ac7
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -96,7 +96,7 @@ Rectangle {
visible: true
z: 2
id: column1
height: 200
height: 210
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
@ -111,10 +111,10 @@ Rectangle {
anchors.leftMargin: 20
anchors.verticalCenter: parent.verticalCenter
height: 490 * scaleRatio
width: 259 * scaleRatio
width: 260 * scaleRatio
Image {
width: 259; height: 170
width: 260; height: 170
fillMode: Image.PreserveAspectFit
source: "images/card-background.png"
}
@ -247,19 +247,17 @@ Rectangle {
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.top: (isMobile)? parent.top : column1.bottom
anchors.topMargin: (isMobile)? 0 : 32
color: "transparent"
Flickable {
id:flicker
contentHeight: (progressBar.visible)? menuColumn.height + separator.height +
networkStatus.height + progressBar.height + daemonProgressBar.height :
menuColumn.height + separator.height + networkStatus.height
anchors.fill: parent
contentHeight: menuColumn.height
anchors.top: parent.top
anchors.bottom: networkStatus.top
width: parent.width
clip: true
Column {
id: menuColumn