From 55fa291e74422bb6a380b5c376fa39a83d064ea2 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 25 Aug 2021 14:35:46 +0200 Subject: [PATCH] Fix multi-line error messages on text fields --- linphone-app/ui/modules/Common/Form/Fields/TextField.qml | 3 ++- linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/linphone-app/ui/modules/Common/Form/Fields/TextField.qml b/linphone-app/ui/modules/Common/Form/Fields/TextField.qml index b6e2d880c..09d548fcf 100644 --- a/linphone-app/ui/modules/Common/Form/Fields/TextField.qml +++ b/linphone-app/ui/modules/Common/Form/Fields/TextField.qml @@ -90,7 +90,7 @@ Controls.TextField { onClicked: textField.iconClicked() } } - bottomPadding: (statusItem.visible?statusItem.height:2) + bottomPadding: (statusItem.visible?statusItem.implicitHeight:2) TextEdit{ id:statusItem selectByMouse: true @@ -103,6 +103,7 @@ Controls.TextField { anchors.rightMargin:10 + toolsContainer.width horizontalAlignment:Text.AlignRight verticalAlignment: Text.AlignVCenter + wrapMode: TextEdit.WordWrap font { italic: true pointSize: textFieldStyle.text.pointSize diff --git a/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml b/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml index 73e6be17d..567f7bf61 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml @@ -26,7 +26,8 @@ DialogPlus { chatRoomModel.leaveChatRoom(); exit(0) } - enabled:!chatRoomModel.hasBeenLeft + enabled: !chatRoomModel.hasBeenLeft + visible: !chatRoomModel.isOneToOne },Item{ Layout.fillWidth: true }, @@ -46,7 +47,7 @@ DialogPlus { showCloseCross: true //: "Group information" : Popup title. //~ This popup display data about the current chat room - title: "Group information" + title: qsTr("chatRoomDetailsTitle") property ChatRoomModel chatRoomModel buttonsAlignment: Qt.AlignBottom