status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-19 18:18:38 +00:00
Code Issues Projects Releases Wiki Activity

fix(StatusMessage): stickers were not aligned correctly

Browse Source
This commit is contained in:
Alexandra Betouni 2023-01-26 15:54:00 +02:00 committed by Alexandra Betouni
parent 78f4560a54
commit 1793844cdb
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
View File

@ -20,7 +20,8 @@ Control {
Sticker = 4, Sticker = 4,
Audio = 5, Audio = 5,
Transaction = 6, Transaction = 6,
Invitation = 7 Invitation = 7,
DiscordMessage = 8
} }
property list<Item> quickActions property list<Item> quickActions
@ -184,7 +185,6 @@ Control {
id: messageLayout id: messageLayout
anchors.fill: parent anchors.fill: parent
spacing: 2 spacing: 2
Loader { Loader {
Layout.fillWidth: true Layout.fillWidth: true
active: isAReply active: isAReply
@ -253,7 +253,10 @@ Control {
} }
Loader { Loader {
Layout.fillWidth: true Layout.fillWidth: true
active: !root.editMode && !!root.messageDetails.messageText && !root.hideMessage active: (!root.editMode && !!root.messageDetails.messageText && !root.hideMessage
&& ((root.messageDetails.contentType === StatusMessage.ContentType.Text)
|| (root.messageDetails.contentType === StatusMessage.ContentType.Emoji) ||
(root.messageDetails.contentType === StatusMessage.ContentType.DiscordMessage)))
visible: active visible: active
sourceComponent: StatusTextMessage { sourceComponent: StatusTextMessage {
objectName: "StatusMessage_textMessage" objectName: "StatusMessage_textMessage"

4
ui/imports/shared/views/chat/MessageView.qml
View File

@ -363,6 +363,8 @@ Loader {
StatusMessage { StatusMessage {
id: delegate id: delegate
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 2
Layout.bottomMargin: 2
function convertContentType(value) { function convertContentType(value) {
switch (value) { switch (value) {
@ -380,6 +382,8 @@ Loader {
return StatusMessage.ContentType.Audio; return StatusMessage.ContentType.Audio;
case Constants.messageContentType.communityInviteType: case Constants.messageContentType.communityInviteType:
return StatusMessage.ContentType.Invitation; return StatusMessage.ContentType.Invitation;
case Constants.messageContentType.discordMessageType:
return StatusMessage.ContentType.DiscordMessage;
case Constants.messageContentType.fetchMoreMessagesButton: case Constants.messageContentType.fetchMoreMessagesButton:
case Constants.messageContentType.chatIdentifier: case Constants.messageContentType.chatIdentifier:
case Constants.messageContentType.unknownContentType: case Constants.messageContentType.unknownContentType: