diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-02-04 14:35:18 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-02-04 14:35:18 -0500 |
| commit | 8f197bc6ac31912834159088248c201c5128a4ce (patch) | |
| tree | 2b6b126e108a7813ad42acb9dfbb32c537d55bc8 | |
| parent | 82bc71c81d15827a8f7c4b956e4e313bf8178d8d (diff) | |
| parent | b6d554eebdc6448a3766644f96521f4bfc8b6ba5 (diff) | |
| download | monzero-gui-8f197bc6ac31912834159088248c201c5128a4ce.tar.gz monzero-gui-8f197bc6ac31912834159088248c201c5128a4ce.tar.xz monzero-gui-8f197bc6ac31912834159088248c201c5128a4ce.zip | |
Merge pull request #2756
b6d554e LeftPanel: NetworkStatusItem fixed at bottom left corner (rating89us)
| -rw-r--r-- | LeftPanel.qml | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/LeftPanel.qml b/LeftPanel.qml index 18c19d56..74ca6feb 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -348,7 +348,7 @@ Rectangle { id:flicker contentHeight: menuColumn.height anchors.top: parent.top - anchors.bottom: networkStatus.top + anchors.bottom: progressBar.visible ? progressBar.top : networkStatus.top width: parent.width boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds clip: true @@ -644,22 +644,11 @@ Rectangle { anchors.right: parent.right anchors.leftMargin: 0 anchors.rightMargin: 0 - anchors.bottom: networkStatus.top; + anchors.bottom: progressBar.visible ? progressBar.top : networkStatus.top height: 10 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 { id: progressBar anchors.left: parent.left @@ -674,10 +663,22 @@ Rectangle { id: daemonProgressBar anchors.left: parent.left anchors.right: parent.right - anchors.bottom: parent.bottom + anchors.bottom: networkStatus.top syncType: qsTr("Daemon") + translationManager.emptyString visible: !appWindow.disconnected 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 + } } } |