From e753dd509eb681ec784c68ed528770a43eaf3901 Mon Sep 17 00:00:00 2001
From: cberthet <capucine.berthet@savoirfairelinux.com>
Date: Thu, 30 Nov 2023 15:26:19 -0500
Subject: [PATCH] PasswordDialog: resolve display issue
GitLab: #1444
Change-Id: I248220b04b4343c73fdd55ce4de0a871aa89c4bc
---
src/app/commoncomponents/PasswordDialog.qml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/app/commoncomponents/PasswordDialog.qml b/src/app/commoncomponents/PasswordDialog.qml
index 35b590de2..82c9ced83 100644
--- a/src/app/commoncomponents/PasswordDialog.qml
+++ b/src/app/commoncomponents/PasswordDialog.qml
@@ -17,6 +17,7 @@
*/
import QtQuick
import QtQuick.Layouts
+import QtQuick.Controls
import net.jami.Adapters 1.1
import net.jami.Constants 1.1
@@ -76,6 +77,9 @@ BaseModalDialog {
button1Role: DialogButtonBox.ApplyRole
button1.enabled: purpose === PasswordDialog.SetPassword
+ button2.text: JamiStrings.cancel
+ button2Role: DialogButtonBox.RejectRole
+ button2.onClicked: close()
popupContent: ColumnLayout {
id: popupContentColumnLayout
@@ -167,6 +171,7 @@ BaseModalDialog {
Layout.alignment: Qt.AlignHCenter
Layout.preferredHeight: visible ? 48 : 0
+ Layout.bottomMargin: JamiTheme.preferredMarginSize
Layout.fillWidth: true
visible: purpose === PasswordDialog.ChangePassword || purpose === PasswordDialog.SetPassword
--
GitLab