diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 023de8f0a..ceddfd687 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -23,6 +23,16 @@ Item { property var room: null property var roomPreview: null property bool showBackButton: false + property int fullHeight + + Component.onCompleted: { + fullHeight = height + } + onHeightChanged: { + if(!Qt.inputMethod.visible) + fullHeight = height + } + clip: true Label { diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml index 23cca019e..64c5b3567 100644 --- a/resources/qml/delegates/ImageMessage.qml +++ b/resources/qml/delegates/ImageMessage.qml @@ -22,7 +22,7 @@ AbstractButton { property int tempWidth: originalWidth < 1? 400: originalWidth - implicitWidth: Math.round(tempWidth*Math.min((timelineView.height/divisor)/(tempWidth*proportionalHeight), 1)) + implicitWidth: Math.round(tempWidth*Math.min((timelineView.fullHeight/divisor)/(tempWidth*proportionalHeight), 1)) width: Math.min(parent.width,implicitWidth) height: width*proportionalHeight hoverEnabled: true diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml index 4828843cc..4a23e259e 100644 --- a/resources/qml/delegates/PlayableMediaMessage.qml +++ b/resources/qml/delegates/PlayableMediaMessage.qml @@ -25,7 +25,7 @@ Item { required property string filesize property double divisor: isReply ? 4 : 2 property int tempWidth: originalWidth < 1? 400: originalWidth - implicitWidth: type == MtxEvent.VideoMessage ? Math.round(tempWidth*Math.min((timelineView.height/divisor)/(tempWidth*proportionalHeight), 1)) : 500 + implicitWidth: type == MtxEvent.VideoMessage ? Math.round(tempWidth*Math.min((timelineView.fullHeight/divisor)/(tempWidth*proportionalHeight), 1)) : 500 width: Math.min(parent.width, implicitWidth) height: (type == MtxEvent.VideoMessage ? width*proportionalHeight : 80) + fileInfoLabel.height implicitHeight: height diff --git a/resources/qml/delegates/TextMessage.qml b/resources/qml/delegates/TextMessage.qml index 73411ab60..bc42274ab 100644 --- a/resources/qml/delegates/TextMessage.qml +++ b/resources/qml/delegates/TextMessage.qml @@ -36,7 +36,7 @@ MatrixText { " + formatted.replace(/
/g, "").replace(//g, "").replace(/<\/del>/g, "").replace(//g, "").replace(/<\/strike>/g, "") width: parent.width - height: isReply ? Math.round(Math.min(timelineView.height / 8, implicitHeight)) : implicitHeight + height: isReply ? Math.round(Math.min(timelineView.fullHeight / 8, implicitHeight)) : implicitHeight clip: isReply selectByMouse: !Settings.mobileMode && !isReply font.pointSize: (Settings.enlargeEmojiOnlyMessages && isOnlyEmoji > 0 && isOnlyEmoji < 4) ? Settings.fontSize * 3 : Settings.fontSize diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 636bf75f8..a2b198baa 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -1131,8 +1131,7 @@ UserSettingsModel::data(const QModelIndex &index, int role) const "Allow using markdown in messages.\nWhen disabled, all messages are sent as a plain " "text."); case Bubbles: - return tr( - "Messages get a bubble background. This also triggers some layout changes (WIP)."); + return tr("Messages get a bubble background. This also triggers some layout changes."); case SmallAvatars: return tr("Avatars are resized to fit above the message."); case AnimateImagesOnHover: