feat: add back date group in compact mode

This commit is contained in:
Jonathan Rainville 2021-01-26 15:29:33 -05:00 committed by Iuri Matias
parent bffe888b0d
commit 8a43fffd77
1 changed files with 9 additions and 7 deletions

View File

@ -18,7 +18,8 @@ Item {
id: root id: root
width: parent.width width: parent.width
height: messageContainer.height height: messageContainer.height + messageContainer.anchors.topMargin
+ (dateGroupLbl.visible ? dateGroupLbl.height + dateGroupLbl.anchors.topMargin : 0)
MouseArea { MouseArea {
anchors.fill: messageContainer anchors.fill: messageContainer
@ -47,10 +48,16 @@ Item {
} }
} }
DateGroup {
id: dateGroupLbl
}
Rectangle { Rectangle {
property alias chatText: chatText property alias chatText: chatText
id: messageContainer id: messageContainer
anchors.top: dateGroupLbl.visible ? dateGroupLbl.bottom : parent.top
anchors.topMargin: dateGroupLbl.visible ? Style.current.padding : 0
height: childrenRect.height + (chatName.visible || emojiReactionLoader.active ? Style.current.smallPadding : 0) height: childrenRect.height + (chatName.visible || emojiReactionLoader.active ? Style.current.smallPadding : 0)
+ (chatName.visible && emojiReactionLoader.active ? 5 : 0) + (chatName.visible && emojiReactionLoader.active ? 5 : 0)
+ (emojiReactionLoader.active ? emojiReactionLoader.height: 0) + (emojiReactionLoader.active ? emojiReactionLoader.height: 0)
@ -60,16 +67,12 @@ Item {
color: root.isHovered || isMessageActive ? (hasMention ? Style.current.mentionMessageHoverColor : Style.current.backgroundHover) : color: root.isHovered || isMessageActive ? (hasMention ? Style.current.mentionMessageHoverColor : Style.current.backgroundHover) :
(hasMention ? Style.current.mentionMessageColor : Style.current.transparent) (hasMention ? Style.current.mentionMessageColor : Style.current.transparent)
// FIXME @jonathanr: Adding this breaks the first line. Need to fix the height somehow
// DateGroup {
// id: dateGroupLbl
// }
UserImage { UserImage {
id: chatImage id: chatImage
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: Style.current.padding anchors.leftMargin: Style.current.padding
// anchors.top: dateGroupLbl.visible ? dateGroupLbl.bottom : parent.top
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: Style.current.smallPadding anchors.topMargin: Style.current.smallPadding
} }
@ -77,7 +80,6 @@ Item {
UsernameLabel { UsernameLabel {
id: chatName id: chatName
anchors.leftMargin: root.chatHorizontalPadding anchors.leftMargin: root.chatHorizontalPadding
// anchors.top: dateGroupLbl.visible ? dateGroupLbl.bottom : parent.top
anchors.top: chatImage.top anchors.top: chatImage.top
anchors.left: chatImage.right anchors.left: chatImage.right
} }