fix read background to only cover the message and fix hidden text
This commit is contained in:
Jonathan Rainville
parent
93b4c29060
commit
1ecb636f58
|
|
@ -152,7 +152,7 @@ Popup {
|
|||
Component {
|
||||
id: messageNotificationComponent
|
||||
|
||||
Rectangle {
|
||||
Item {
|
||||
visible: {
|
||||
if (hideReadNotifications && model.read) {
|
||||
return false
|
||||
|
|
@ -163,61 +163,7 @@ Popup {
|
|||
(model.notificationType === Constants.activityCenterNotificationTypeReply && activityCenter.currentFilter === ActivityCenter.Filter.Replies)
|
||||
}
|
||||
width: parent.width
|
||||
height: childrenRect.height + Style.current.smallPadding
|
||||
color: model.read ? Style.current.transparent : Utils.setColorAlpha(Style.current.blue, 0.1)
|
||||
|
||||
Message {
|
||||
id: notificationMessage
|
||||
anchors.right: undefined
|
||||
fromAuthor: model.message.fromAuthor
|
||||
chatId: model.message.chatId
|
||||
userName: model.message.userName
|
||||
alias: model.message.alias
|
||||
localName: model.message.localName
|
||||
message: model.message.message
|
||||
plainText: model.message.plainText
|
||||
identicon: model.message.identicon
|
||||
isCurrentUser: model.message.isCurrentUser
|
||||
timestamp: model.message.timestamp
|
||||
sticker: model.message.sticker
|
||||
contentType: model.message.contentType
|
||||
outgoingStatus: model.message.outgoingStatus
|
||||
responseTo: model.message.responseTo
|
||||
imageClick: imagePopup.openPopup.bind(imagePopup)
|
||||
messageId: model.message.messageId
|
||||
linkUrls: model.message.linkUrls
|
||||
communityId: model.message.communityId
|
||||
hasMention: model.message.hasMention
|
||||
stickerPackId: model.message.stickerPackId
|
||||
pinnedBy: model.message.pinnedBy
|
||||
pinnedMessage: model.message.isPinned
|
||||
activityCenterMessage: true
|
||||
clickMessage: function (isProfileClick) {
|
||||
if (isProfileClick) {
|
||||
const pk = model.message.fromAuthor
|
||||
const userProfileImage = appMain.getProfileImage(pk)
|
||||
return openProfilePopup(chatsModel.userNameOrAlias(pk), pk, userProfileImage || utilsModel.generateIdenticon(pk))
|
||||
}
|
||||
|
||||
activityCenter.close()
|
||||
chatsModel.setActiveChannel(model.message.chatId)
|
||||
positionAtMessage(model.message.messageId)
|
||||
}
|
||||
|
||||
prevMessageIndex: {
|
||||
if (notificationDelegate.idx === 0) {
|
||||
return 0
|
||||
}
|
||||
|
||||
// This is used in order to have access to the previous message and determine the timestamp
|
||||
// we can't rely on the index because the sequence of messages is not ordered on the nim side
|
||||
if (notificationDelegate.idx < notifDelegateList.items.count - 1) {
|
||||
return notifDelegateList.items.get(notificationDelegate.idx - 1).model.index
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
prevMsgTimestamp: notificationDelegate.idx === 0 ? "" : chatsModel.activityNotificationList.getNotificationData(prevMessageIndex, "timestamp")
|
||||
}
|
||||
height: messageNotificationContent.height
|
||||
|
||||
StatusIconButton {
|
||||
id: markReadBtn
|
||||
|
|
@ -230,7 +176,7 @@ Popup {
|
|||
onClicked: chatsModel.activityNotificationList.markActivityCenterNotificationRead(model.id)
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 12
|
||||
anchors.verticalCenter: notificationMessage.verticalCenter
|
||||
anchors.verticalCenter: messageNotificationContent.verticalCenter
|
||||
z: 52
|
||||
|
||||
StatusToolTip {
|
||||
|
|
@ -242,15 +188,84 @@ Popup {
|
|||
}
|
||||
}
|
||||
|
||||
ActivityChannelBadge {
|
||||
id: badge
|
||||
name: model.name
|
||||
chatId: model.chatId
|
||||
notificationType: model.notificationType
|
||||
responseTo: model.message.responseTo
|
||||
anchors.top: notificationMessage.bottom
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 61 // TODO find a way to align with the text of the message
|
||||
Item {
|
||||
id: messageNotificationContent
|
||||
width: parent.width
|
||||
height: childrenRect.height
|
||||
|
||||
Message {
|
||||
id: notificationMessage
|
||||
anchors.right: undefined
|
||||
fromAuthor: model.message.fromAuthor
|
||||
chatId: model.message.chatId
|
||||
userName: model.message.userName
|
||||
alias: model.message.alias
|
||||
localName: model.message.localName
|
||||
message: model.message.message
|
||||
plainText: model.message.plainText
|
||||
identicon: model.message.identicon
|
||||
isCurrentUser: model.message.isCurrentUser
|
||||
timestamp: model.message.timestamp
|
||||
sticker: model.message.sticker
|
||||
contentType: model.message.contentType
|
||||
outgoingStatus: model.message.outgoingStatus
|
||||
responseTo: model.message.responseTo
|
||||
imageClick: imagePopup.openPopup.bind(imagePopup)
|
||||
messageId: model.message.messageId
|
||||
linkUrls: model.message.linkUrls
|
||||
communityId: model.message.communityId
|
||||
hasMention: model.message.hasMention
|
||||
stickerPackId: model.message.stickerPackId
|
||||
pinnedBy: model.message.pinnedBy
|
||||
pinnedMessage: model.message.isPinned
|
||||
activityCenterMessage: true
|
||||
read: model.read
|
||||
clickMessage: function (isProfileClick) {
|
||||
if (isProfileClick) {
|
||||
const pk = model.message.fromAuthor
|
||||
const userProfileImage = appMain.getProfileImage(pk)
|
||||
return openProfilePopup(chatsModel.userNameOrAlias(pk), pk, userProfileImage || utilsModel.generateIdenticon(pk))
|
||||
}
|
||||
|
||||
activityCenter.close()
|
||||
chatsModel.setActiveChannel(model.message.chatId)
|
||||
positionAtMessage(model.message.messageId)
|
||||
}
|
||||
|
||||
prevMessageIndex: {
|
||||
if (notificationDelegate.idx === 0) {
|
||||
return 0
|
||||
}
|
||||
|
||||
// This is used in order to have access to the previous message and determine the timestamp
|
||||
// we can't rely on the index because the sequence of messages is not ordered on the nim side
|
||||
if (notificationDelegate.idx < notifDelegateList.items.count - 1) {
|
||||
return notifDelegateList.items.get(notificationDelegate.idx - 1).model.index
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
prevMsgTimestamp: notificationDelegate.idx === 0 ? "" : chatsModel.activityNotificationList.getNotificationData(prevMessageIndex, "timestamp")
|
||||
}
|
||||
|
||||
ActivityChannelBadge {
|
||||
id: badge
|
||||
name: model.name
|
||||
chatId: model.chatId
|
||||
notificationType: model.notificationType
|
||||
responseTo: model.message.responseTo
|
||||
anchors.top: notificationMessage.bottom
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 61 // TODO find a way to align with the text of the message
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
anchors.top: notificationMessage.bottom
|
||||
anchors.bottom: badge.bottom
|
||||
anchors.bottomMargin: -Style.current.smallPadding
|
||||
width: parent.width
|
||||
color: model.read ? Style.current.transparent : Utils.setColorAlpha(Style.current.blue, 0.1)
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ Item {
|
|||
property bool placeholderMessage: false
|
||||
property bool activityCenterMessage: false
|
||||
property bool pinnedMessage: false
|
||||
property bool read: true
|
||||
property string pinnedBy
|
||||
property bool forceHoverHandler: false // Used to force the HoverHandler to be active (useful for messages in popups)
|
||||
property string communityId: ""
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ Item {
|
|||
selectByMouse: true
|
||||
color: Style.current.textColor
|
||||
height: root.veryLongChatText && !root.readMore ? Math.min(implicitHeight, 200) : implicitHeight
|
||||
clip: true
|
||||
clip: height < implicitHeight
|
||||
onLinkActivated: function (link) {
|
||||
if(link.startsWith("#")) {
|
||||
const channelName = link.substring(1);
|
||||
|
|
|
|||
|
|
@ -76,7 +76,11 @@ Item {
|
|||
width: parent.width
|
||||
|
||||
color: {
|
||||
if (placeholderMessage || activityCenterMessage) {
|
||||
if (activityCenterMessage) {
|
||||
return read ? Style.current.transparent : Utils.setColorAlpha(Style.current.blue, 0.1)
|
||||
}
|
||||
|
||||
if (placeholderMessage) {
|
||||
return Style.current.transparent
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue