forked from cwtch.im/ui
Merge branch 'alpha-updates' of cwtch.im/ui into master
This commit is contained in:
commit
d9623c6b3f
|
@ -11,9 +11,11 @@ Item {
|
||||||
implicitHeight: 48
|
implicitHeight: 48
|
||||||
anchors.margins: 5
|
anchors.margins: 5
|
||||||
|
|
||||||
|
property string handle
|
||||||
property alias source: img.source
|
property alias source: img.source
|
||||||
property int status
|
property int status
|
||||||
property bool isGroup
|
property bool isGroup
|
||||||
|
property bool showStatus
|
||||||
|
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
|
@ -44,6 +46,7 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle { // PRESENCE INDICATOR
|
Rectangle { // PRESENCE INDICATOR
|
||||||
|
visible: showStatus
|
||||||
color: "#FFFFFF"
|
color: "#FFFFFF"
|
||||||
width: 8
|
width: 8
|
||||||
height: 8
|
height: 8
|
||||||
|
|
|
@ -39,6 +39,7 @@ RowLayout { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
|
||||||
|
|
||||||
ContactPicture {
|
ContactPicture {
|
||||||
id: imgProfile
|
id: imgProfile
|
||||||
|
showStatus: true
|
||||||
}
|
}
|
||||||
|
|
||||||
Label { // CONTACT NAME
|
Label { // CONTACT NAME
|
||||||
|
|
|
@ -31,13 +31,16 @@ RowLayout {
|
||||||
ack.source = "qrc:/qml/images/fontawesome/regular/check-circle.svg"
|
ack.source = "qrc:/qml/images/fontawesome/regular/check-circle.svg"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ContactPicture {
|
ContactPicture {
|
||||||
id: imgProfile
|
id: imgProfile
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
|
handle: root.from
|
||||||
visible: !fromMe
|
visible: !fromMe
|
||||||
|
showStatus: false
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
@ -48,6 +51,7 @@ RowLayout {
|
||||||
overlayStack.overlay = overlayStack.chatOverlay
|
overlayStack.overlay = overlayStack.chatOverlay
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle { // THIS IS JUST A PRETTY MESSAGE-HOLDING RECTANGLE
|
Rectangle { // THIS IS JUST A PRETTY MESSAGE-HOLDING RECTANGLE
|
||||||
|
|
Loading…
Reference in New Issue