AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: render balance bar using (local|remote) capacity instead of can_(send|receive)

Browse Source
This commit is contained in:
Sander van Grieken
2023-03-14 12:42:52 +01:00
parent 842229c4bb
commit 7fc4153f46
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/gui/qml/components/controls/ChannelDelegate.qml
View File

@@ -113,10 +113,10 @@ ItemDelegate {
onWidthChanged: { onWidthChanged: {
var cap = model.capacity.satsInt * 1000 var cap = model.capacity.satsInt * 1000
var twocap = cap * 2 var twocap = cap * 2
b1.width = width * (cap - model.can_send.msatsInt) / twocap b1.width = width * (cap - model.local_capacity.msatsInt) / twocap
b2.width = width * model.can_send.msatsInt / twocap b2.width = width * model.local_capacity.msatsInt / twocap
b3.width = width * model.can_receive.msatsInt / twocap b3.width = width * model.remote_capacity.msatsInt / twocap
b4.width = width * (cap - model.can_receive.msatsInt) / twocap b4.width = width * (cap - model.remote_capacity.msatsInt) / twocap
} }
Rectangle { Rectangle {
id: b1 id: b1

6
electrum/gui/qml/qechannellistmodel.py
View File

@@ -17,7 +17,7 @@ class QEChannelListModel(QAbstractListModel, QtEventListener):
_ROLE_NAMES=('cid','state','state_code','initiator','capacity','can_send', _ROLE_NAMES=('cid','state','state_code','initiator','capacity','can_send',
'can_receive','l_csv_delay','r_csv_delay','send_frozen','receive_frozen', 'can_receive','l_csv_delay','r_csv_delay','send_frozen','receive_frozen',
'type','node_id','node_alias','short_cid','funding_tx','is_trampoline', 'type','node_id','node_alias','short_cid','funding_tx','is_trampoline',
'is_backup', 'is_imported') 'is_backup', 'is_imported', 'local_capacity', 'remote_capacity')
_ROLE_KEYS = range(Qt.UserRole, Qt.UserRole + len(_ROLE_NAMES)) _ROLE_KEYS = range(Qt.UserRole, Qt.UserRole + len(_ROLE_NAMES))
_ROLE_MAP = dict(zip(_ROLE_KEYS, [bytearray(x.encode()) for x in _ROLE_NAMES])) _ROLE_MAP = dict(zip(_ROLE_KEYS, [bytearray(x.encode()) for x in _ROLE_NAMES]))
_ROLE_RMAP = dict(zip(_ROLE_NAMES, _ROLE_KEYS)) _ROLE_RMAP = dict(zip(_ROLE_NAMES, _ROLE_KEYS))
@@ -91,10 +91,14 @@ class QEChannelListModel(QAbstractListModel, QtEventListener):
if lnc.is_backup(): if lnc.is_backup():
item['can_send'] = QEAmount() item['can_send'] = QEAmount()
item['can_receive'] = QEAmount() item['can_receive'] = QEAmount()
item['local_capacity'] = QEAmount()
item['remote_capacity'] = QEAmount()
item['is_imported'] = lnc.is_imported item['is_imported'] = lnc.is_imported
else: else:
item['can_send'] = QEAmount(amount_msat=lnc.available_to_spend(LOCAL)) item['can_send'] = QEAmount(amount_msat=lnc.available_to_spend(LOCAL))
item['can_receive'] = QEAmount(amount_msat=lnc.available_to_spend(REMOTE)) item['can_receive'] = QEAmount(amount_msat=lnc.available_to_spend(REMOTE))
item['local_capacity'] = QEAmount(amount_msat=lnc.balance(LOCAL))
item['remote_capacity'] = QEAmount(amount_msat=lnc.balance(REMOTE))
item['is_imported'] = False item['is_imported'] = False
return item return item