From eaec313a3c0b2b29404f1455c1843f19aeb21b3e Mon Sep 17 00:00:00 2001
From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
Date: Mon, 27 Feb 2023 15:38:27 -0300
Subject: [PATCH] misc: fit edited message to area
Change-Id: I019fba4105bde11d049d64a8e94716c0e977f79e
GitLab: #1001
---
src/app/mainview/components/ChatViewFooter.qml | 6 ++++--
src/app/mainview/components/EditContainer.qml | 2 +-
src/app/utilsadapter.cpp | 10 ++++++++++
src/app/utilsadapter.h | 2 ++
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/app/mainview/components/ChatViewFooter.qml b/src/app/mainview/components/ChatViewFooter.qml
index 3f14f7aea..e6b313318 100644
--- a/src/app/mainview/components/ChatViewFooter.qml
+++ b/src/app/mainview/components/ChatViewFooter.qml
@@ -116,7 +116,8 @@ Rectangle {
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: footerColumnLayout.width
Layout.maximumWidth: JamiTheme.chatViewMaximumWidth
- Layout.preferredHeight: 36
+ Layout.minimumHeight: 36
+ Layout.preferredHeight: 36 * JamiTheme.baseZoom
visible: MessagesAdapter.replyToId !== ""
}
@@ -126,7 +127,8 @@ Rectangle {
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: footerColumnLayout.width
Layout.maximumWidth: JamiTheme.chatViewMaximumWidth
- Layout.preferredHeight: 36
+ Layout.minimumHeight: 36
+ Layout.preferredHeight: 36 * JamiTheme.baseZoom
visible: MessagesAdapter.editId !== ""
}
diff --git a/src/app/mainview/components/EditContainer.qml b/src/app/mainview/components/EditContainer.qml
index e4576fc3c..0404a3076 100644
--- a/src/app/mainview/components/EditContainer.qml
+++ b/src/app/mainview/components/EditContainer.qml
@@ -65,7 +65,7 @@ Rectangle {
id: metrics
elide: Text.ElideRight
elideWidth: root.width - 100
- text: root.body
+ text: UtilsAdapter.getOneline(root.body)
}
text: metrics.elidedText
diff --git a/src/app/utilsadapter.cpp b/src/app/utilsadapter.cpp
index cb1fdd83c..c6d9654db 100644
--- a/src/app/utilsadapter.cpp
+++ b/src/app/utilsadapter.cpp
@@ -735,3 +735,13 @@ UtilsAdapter::hasNativeDarkTheme() const
#endif
#endif
}
+
+QString
+UtilsAdapter::getOneline(const QString& input)
+{
+ auto output = input;
+ auto index = output.indexOf("\n");
+ if (index > 0)
+ output.truncate(index);
+ return output;
+}
diff --git a/src/app/utilsadapter.h b/src/app/utilsadapter.h
index c0a520e5c..eef34dca0 100644
--- a/src/app/utilsadapter.h
+++ b/src/app/utilsadapter.h
@@ -139,6 +139,8 @@ public:
Q_INVOKABLE bool useApplicationTheme();
Q_INVOKABLE bool hasNativeDarkTheme() const;
+ Q_INVOKABLE QString getOneline(const QString& input);
+
Q_SIGNALS:
void debugMessageReceived(const QString& message);
void changeFontSize();
--
GitLab