Skip to content

Commit

Permalink
fix: reactions distance to message content is inconsistent
Browse files Browse the repository at this point in the history
- harmonize the margins/spacings in other messagage components
- fix warnings
- cleanup/remoe some dead code

Fixes #8295
  • Loading branch information
caybro committed Nov 22, 2022
1 parent 6609ebd commit 933dbcd
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 16 deletions.
1 change: 0 additions & 1 deletion ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,6 @@ Control {
id: emojiReactionsPanel

emojiReactionsModel: root.reactionsModel
store: root.messageStore
icons: root.reactionIcons

onHoverChanged: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ Item {
signal hoverChanged(bool hovered)
signal toggleReaction(int emojiID)

property var store
property bool isCurrentUser
property var emojiReactionsModel

Expand Down
10 changes: 2 additions & 8 deletions ui/imports/shared/views/chat/InvitationBubbleView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,12 @@ Item {

Connections {
target: root.store.communitiesModuleInst
onCommunityChanged: function (communityId) {
function onCommunityChanged(communityId) {
if (communityId === root.communityId) {
d.reevaluate()
}
}
}

Connections {
target: root.store.communitiesModuleInst
onCommunityAdded: function (communityId) {
function onCommunityAdded(communityId) {
if (communityId === root.communityId) {
d.reevaluate()
}
Expand Down Expand Up @@ -136,7 +132,6 @@ Item {
// }
}
wrapMode: Text.WordWrap
font.pixelSize: 15
}
}

Expand Down Expand Up @@ -190,7 +185,6 @@ Item {

text: d.invitedCommunity.description
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
font.pixelSize: 15
color: Theme.palette.directColor1
}

Expand Down
8 changes: 2 additions & 6 deletions ui/imports/shared/views/chat/LinksMessageView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ Column {

signal imageClicked(var image)

spacing: Style.current.halfPadding
height: childrenRect.height
spacing: 4

QtObject {
id: d
Expand Down Expand Up @@ -275,7 +274,6 @@ Column {
isCurrentUser: root.isCurrentUser
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
anchors.topMargin: 1
playing: root.messageStore.playAnimation
isOnline: root.store.mainModuleInst.isOnline
}
Expand All @@ -292,7 +290,6 @@ Column {
anchors.right: parent.right
anchors.leftMargin: Style.current.smallPadding
anchors.rightMargin: Style.current.smallPadding
color: Theme.palette.directColor1
}

StatusBaseText {
Expand All @@ -304,7 +301,7 @@ Column {
anchors.top: linkTitle.bottom
anchors.topMargin: 2
anchors.left: linkTitle.left
anchors.bottomMargin: Style.current.smallPadding
anchors.bottomMargin: Style.current.halfPadding
}

MouseArea {
Expand Down Expand Up @@ -370,7 +367,6 @@ Column {
wrapMode: Text.WordWrap
anchors.top: unfurlingImage.bottom
anchors.topMargin: Style.current.halfPadding
font.pixelSize: 15
color: Theme.palette.directColor1
}

Expand Down

0 comments on commit 933dbcd

Please sign in to comment.