mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-11-16 15:58:11 +00:00
Merge pull request #2756
b6d554e
LeftPanel: NetworkStatusItem fixed at bottom left corner (rating89us)
This commit is contained in:
commit
8f197bc6ac
1 changed files with 15 additions and 14 deletions
|
@ -348,7 +348,7 @@ Rectangle {
|
||||||
id:flicker
|
id:flicker
|
||||||
contentHeight: menuColumn.height
|
contentHeight: menuColumn.height
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.bottom: networkStatus.top
|
anchors.bottom: progressBar.visible ? progressBar.top : networkStatus.top
|
||||||
width: parent.width
|
width: parent.width
|
||||||
boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
|
boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -644,22 +644,11 @@ Rectangle {
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.leftMargin: 0
|
anchors.leftMargin: 0
|
||||||
anchors.rightMargin: 0
|
anchors.rightMargin: 0
|
||||||
anchors.bottom: networkStatus.top;
|
anchors.bottom: progressBar.visible ? progressBar.top : networkStatus.top
|
||||||
height: 10
|
height: 10
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
}
|
}
|
||||||
|
|
||||||
MoneroComponents.NetworkStatusItem {
|
|
||||||
id: networkStatus
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.leftMargin: 5
|
|
||||||
anchors.rightMargin: 0
|
|
||||||
anchors.bottom: (progressBar.visible)? progressBar.top : parent.bottom;
|
|
||||||
connected: Wallet.ConnectionStatus_Disconnected
|
|
||||||
height: 48
|
|
||||||
}
|
|
||||||
|
|
||||||
MoneroComponents.ProgressBar {
|
MoneroComponents.ProgressBar {
|
||||||
id: progressBar
|
id: progressBar
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
|
@ -674,10 +663,22 @@ Rectangle {
|
||||||
id: daemonProgressBar
|
id: daemonProgressBar
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: networkStatus.top
|
||||||
syncType: qsTr("Daemon") + translationManager.emptyString
|
syncType: qsTr("Daemon") + translationManager.emptyString
|
||||||
visible: !appWindow.disconnected
|
visible: !appWindow.disconnected
|
||||||
height: 62
|
height: 62
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MoneroComponents.NetworkStatusItem {
|
||||||
|
id: networkStatus
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.leftMargin: 5
|
||||||
|
anchors.rightMargin: 0
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
anchors.bottomMargin: 5
|
||||||
|
connected: Wallet.ConnectionStatus_Disconnected
|
||||||
|
height: 48
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue