diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-04-27 15:31:53 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-04-27 15:31:53 -0500 |
| commit | 1deef732374c0734d91e36e98d7ad812b431dc3c (patch) | |
| tree | 6c1de49f05a5bcfdcf4a5ad1c4e51ceaf9fa73be | |
| parent | 60cefb3820f359b6c87fb631a6e593be317ba2ee (diff) | |
| parent | 791c26734f3acf9361eacc836230943b6d1184aa (diff) | |
| download | monzero-gui-1deef732374c0734d91e36e98d7ad812b431dc3c.tar.gz monzero-gui-1deef732374c0734d91e36e98d7ad812b431dc3c.tar.xz monzero-gui-1deef732374c0734d91e36e98d7ad812b431dc3c.zip | |
Merge pull request #1290
791c267 fix Leftpanel overlay
| -rw-r--r-- | LeftPanel.qml | 23 | ||||
| -rw-r--r-- | components/NetworkStatusItem.qml | 2 | ||||
| -rw-r--r-- | components/ProgressBar.qml | 2 |
3 files changed, 20 insertions, 7 deletions
diff --git a/LeftPanel.qml b/LeftPanel.qml index 071bd928..5da80c49 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -252,7 +252,9 @@ Rectangle { Flickable { id:flicker - contentHeight: 500 * scaleRatio + contentHeight: (progressBar.visible)? menuColumn.height + separator.height + + networkStatus.height + progressBar.height + daemonProgressBar.height : + menuColumn.height + separator.height + networkStatus.height anchors.fill: parent clip: true @@ -568,15 +570,26 @@ Rectangle { } // Flickable + Rectangle { + id: separator + anchors.left: parent.left + anchors.right: parent.right + anchors.leftMargin: 0 + anchors.rightMargin: 0 + anchors.bottom: networkStatus.top; + height: 10 * scaleRatio + color: "black" + } + NetworkStatusItem { id: networkStatus anchors.left: parent.left anchors.right: parent.right - anchors.leftMargin: 4 - anchors.rightMargin: 4 + anchors.leftMargin: 0 + anchors.rightMargin: 0 anchors.bottom: (progressBar.visible)? progressBar.top : parent.bottom; connected: Wallet.ConnectionStatus_Disconnected - height: 58 * scaleRatio + height: 48 * scaleRatio } ProgressBar { @@ -584,7 +597,7 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right anchors.bottom: daemonProgressBar.top - height: 35 * scaleRatio + height: 48 * scaleRatio syncType: qsTr("Wallet") visible: networkStatus.connected } diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml index e9b1b3ae..17acc1c9 100644 --- a/components/NetworkStatusItem.qml +++ b/components/NetworkStatusItem.qml @@ -34,7 +34,7 @@ import "../components" as MoneroComponents Rectangle { id: item - color: "transparent" + color: "black" property var connected: Wallet.ConnectionStatus_Disconnected function getConnectionStatusString(status) { diff --git a/components/ProgressBar.qml b/components/ProgressBar.qml index 9f0bf5f7..e960ddfb 100644 --- a/components/ProgressBar.qml +++ b/components/ProgressBar.qml @@ -37,7 +37,7 @@ Rectangle { property string syncType // Wallet or Daemon property string syncText: qsTr("%1 blocks remaining: ").arg(syncType) visible: false - color: "transparent" + color: "black" function updateProgress(currentBlock,targetBlock, blocksToSync, statusTxt){ if(targetBlock > 0) { |