status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-01-30 08:15:55 +00:00
Code Issues Projects Releases Wiki Activity

fix: disable quick actions when editting a message

Browse Source 
also move the top/bottom margins one level up so that the message editor
gets the same margins as well

Fixes: #8185
This commit is contained in:
Lukáš Tinkl 2022-11-21 17:07:18 +01:00 committed by Lukáš Tinkl
parent c454878e0d
commit 8e4d9be779
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,6 +209,9 @@ Control {
ColumnLayout { ColumnLayout {
id: messageLayout id: messageLayout
anchors.fill: parent anchors.fill: parent
anchors.topMargin: 2
anchors.bottomMargin: 2
spacing: 2
Loader { Loader {
Layout.fillWidth: true Layout.fillWidth: true
@ -234,7 +237,6 @@ Control {
implicitWidth: root.messageDetails.sender.profileImage.assetSettings.width implicitWidth: root.messageDetails.sender.profileImage.assetSettings.width
implicitHeight: profileImage.visible ? profileImage.height : 0 implicitHeight: profileImage.visible ? profileImage.height : 0
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
Layout.topMargin: 2
StatusSmartIdenticon { StatusSmartIdenticon {
id: profileImage id: profileImage
active: root.showHeader active: root.showHeader

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

@ -386,8 +386,6 @@ 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) {
case Constants.messageContentType.messageType: case Constants.messageContentType.messageType:
@ -477,7 +475,8 @@ Loader {
hideQuickActions: root.isChatBlocked || hideQuickActions: root.isChatBlocked ||
root.placeholderMessage || root.placeholderMessage ||
root.activityCenterMessage || root.activityCenterMessage ||
root.isInPinnedPopup root.isInPinnedPopup ||
root.editModeOn
hideMessage: d.isSingleImage && d.unfurledLinksCount === 1 hideMessage: d.isSingleImage && d.unfurledLinksCount === 1
overrideBackground: root.activityCenterMessage || root.placeholderMessage overrideBackground: root.activityCenterMessage || root.placeholderMessage