mirror of
https://github.com/monero-project/monero-gui.git
synced 2025-01-10 11:52:05 +02:00
Merge pull request #1660
784ca96
fixed: networkStatus overlaps menu, padding (xiphon)
This commit is contained in:
commit
7615b86ac7
@ -96,7 +96,7 @@ Rectangle {
|
|||||||
visible: true
|
visible: true
|
||||||
z: 2
|
z: 2
|
||||||
id: column1
|
id: column1
|
||||||
height: 200
|
height: 210
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
@ -111,10 +111,10 @@ Rectangle {
|
|||||||
anchors.leftMargin: 20
|
anchors.leftMargin: 20
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
height: 490 * scaleRatio
|
height: 490 * scaleRatio
|
||||||
width: 259 * scaleRatio
|
width: 260 * scaleRatio
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
width: 259; height: 170
|
width: 260; height: 170
|
||||||
fillMode: Image.PreserveAspectFit
|
fillMode: Image.PreserveAspectFit
|
||||||
source: "images/card-background.png"
|
source: "images/card-background.png"
|
||||||
}
|
}
|
||||||
@ -247,19 +247,17 @@ Rectangle {
|
|||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.top: (isMobile)? parent.top : column1.bottom
|
anchors.top: (isMobile)? parent.top : column1.bottom
|
||||||
anchors.topMargin: (isMobile)? 0 : 32
|
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
|
|
||||||
|
|
||||||
Flickable {
|
Flickable {
|
||||||
id:flicker
|
id:flicker
|
||||||
contentHeight: (progressBar.visible)? menuColumn.height + separator.height +
|
contentHeight: menuColumn.height
|
||||||
networkStatus.height + progressBar.height + daemonProgressBar.height :
|
anchors.top: parent.top
|
||||||
menuColumn.height + separator.height + networkStatus.height
|
anchors.bottom: networkStatus.top
|
||||||
anchors.fill: parent
|
width: parent.width
|
||||||
clip: true
|
clip: true
|
||||||
|
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
|
|
||||||
id: menuColumn
|
id: menuColumn
|
||||||
|
Loading…
Reference in New Issue
Block a user