Merge branch 'ebf20190911a' of cwtch.im/ui into master
the build was successful
Details
the build was successful
Details
This commit is contained in:
commit
fb0e5117c1
|
@ -49,7 +49,7 @@ Item { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
|
||||||
rightPadding: 10
|
rightPadding: 10
|
||||||
//wrapMode: Text.WordWrap
|
//wrapMode: Text.WordWrap
|
||||||
anchors.left: imgProfile.right
|
anchors.left: imgProfile.right
|
||||||
anchors.right: loadingProgress.left
|
anchors.right: loading ? loadingProgress.left : rectUnread.left
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
font.pixelSize: 16 * gcd.themeScale
|
font.pixelSize: 16 * gcd.themeScale
|
||||||
font.italic: !trusted
|
font.italic: !trusted
|
||||||
|
@ -152,17 +152,7 @@ Item { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
|
||||||
status = _status
|
status = _status
|
||||||
trusted = _trusted
|
trusted = _trusted
|
||||||
blocked = _blocked
|
blocked = _blocked
|
||||||
loading = _loading
|
loadingProgress.visible = loadingProgress.running = loading = _loading
|
||||||
|
|
||||||
|
|
||||||
if (loading == true) {
|
|
||||||
loadingProgress.visible = true
|
|
||||||
loadingProgress.running = true
|
|
||||||
} else {
|
|
||||||
loadingProgress.visible = false
|
|
||||||
loadingProgress.running = false
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue