Merge branch 'ebf20190911a' of cwtch.im/ui into master
the build was successful Papildu informācija

This commit is contained in:
Dan Ballard 2019-09-11 13:30:48 -07:00 revīziju iesūtīja Gogs
revīzija fb0e5117c1
1 mainīti faili ar 2 papildinājumiem un 12 dzēšanām

Parādīt failu

@ -49,7 +49,7 @@ Item { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
rightPadding: 10
//wrapMode: Text.WordWrap
anchors.left: imgProfile.right
anchors.right: loadingProgress.left
anchors.right: loading ? loadingProgress.left : rectUnread.left
anchors.verticalCenter: parent.verticalCenter
font.pixelSize: 16 * gcd.themeScale
font.italic: !trusted
@ -152,17 +152,7 @@ Item { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
status = _status
trusted = _trusted
blocked = _blocked
loading = _loading
if (loading == true) {
loadingProgress.visible = true
loadingProgress.running = true
} else {
loadingProgress.visible = false
loadingProgress.running = false
}
loadingProgress.visible = loadingProgress.running = loading = _loading
}
}
}