Browse Source

qml: flow tags to next line if exceeding most of screen width

properly update balance amount strings
patch-4
Sander van Grieken 2 years ago
parent
commit
3eaebe7b47
  1. 42
      electrum/gui/qml/components/WalletSummary.qml
  2. 2
      electrum/gui/qml/components/main.qml

42
electrum/gui/qml/components/WalletSummary.qml

@ -67,9 +67,12 @@ Item {
columns: 2 columns: 2
RowLayout { Flow {
Layout.columnSpan: 2 Layout.columnSpan: 2
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: parent.width * 4/5
spacing: constants.paddingMedium
Tag { Tag {
text: Daemon.currentWallet.walletType text: Daemon.currentWallet.walletType
font.pixelSize: constants.fontSizeSmall font.pixelSize: constants.fontSizeSmall
@ -140,7 +143,7 @@ Item {
Label { Label {
font.pixelSize: constants.fontSizeXLarge font.pixelSize: constants.fontSizeXLarge
font.family: FixedFont font.family: FixedFont
text: Config.formatSats(Daemon.currentWallet.totalBalance) text: formattedTotalBalance
} }
Label { Label {
font.pixelSize: constants.fontSizeXLarge font.pixelSize: constants.fontSizeXLarge
@ -158,7 +161,7 @@ Item {
visible: Daemon.fx.enabled visible: Daemon.fx.enabled
font.pixelSize: constants.fontSizeLarge font.pixelSize: constants.fontSizeLarge
color: constants.mutedForeground color: constants.mutedForeground
text: Daemon.fx.fiatValue(Daemon.currentWallet.totalBalance, false) text: formattedTotalBalanceFiat
} }
Label { Label {
visible: Daemon.fx.enabled visible: Daemon.fx.enabled
@ -205,10 +208,41 @@ Item {
} }
} }
property string formattedTotalBalance
property string formattedTotalBalanceFiat
function setBalances() {
root.formattedTotalBalance = Config.formatSats(Daemon.currentWallet.totalBalance)
if (Daemon.fx.enabled) {
root.formattedTotalBalanceFiat = Daemon.fx.fiatValue(Daemon.currentWallet.totalBalance, false)
}
piechart.updateSlices()
}
// instead of all these explicit connections, we should expose
// formatted balances directly as a property
Connections {
target: Config
function onBaseUnitChanged() { setBalances() }
function onThousandsSeparatorChanged() { setBalances() }
}
Connections {
target: Daemon
function onWalletLoaded() { setBalances() }
}
Connections {
target: Daemon.fx
function onEnabledUpdated() { setBalances() }
function onQuotesUpdated() { setBalances() }
}
Connections { Connections {
target: Daemon.currentWallet target: Daemon.currentWallet
function onBalanceChanged() { function onBalanceChanged() {
piechart.updateSlices() setBalances()
} }
} }

2
electrum/gui/qml/components/main.qml

@ -123,7 +123,7 @@ ApplicationWindow
WalletSummary { WalletSummary {
id: walletSummary id: walletSummary
Layout.preferredWidth: parent.width Layout.preferredWidth: app.width
} }
} }
} }

Loading…
Cancel
Save