From 7c3080367317bd8435ac04e1670df4ec241cb0f4 Mon Sep 17 00:00:00 2001
From: Franck LAURENT <franck.laurent@savoirfairelinux.com>
Date: Tue, 4 Apr 2023 13:09:24 -0400
Subject: [PATCH] AdvancedAccountSettings: fix margin problem

GitLab: #1057

Change-Id: I626cf3d11952c236c82a2329fadb7d893da42ce9
---
 .../components/AdvancedAccountSettings.qml       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/app/wizardview/components/AdvancedAccountSettings.qml b/src/app/wizardview/components/AdvancedAccountSettings.qml
index 371022cb..a9995d3d 100644
--- a/src/app/wizardview/components/AdvancedAccountSettings.qml
+++ b/src/app/wizardview/components/AdvancedAccountSettings.qml
@@ -235,14 +235,20 @@ Rectangle {
                             }
 
                             MaterialButton {
-
                                 id: setButton
 
+                                TextMetrics{
+                                    id: setButtonTextSize
+                                    font.weight: Font.Bold
+                                    font.pixelSize: JamiTheme.wizardViewDescriptionFontPixelSize
+                                    text: setButton.text
+                                }
+
                                 visible: openedPassword
 
                                 Layout.topMargin: 10
                                 Layout.alignment: Qt.AlignCenter
-                                preferredWidth: JamiTheme.wizardButtonWidth / 2
+                                preferredWidth: setButtonTextSize.width + 2*JamiTheme.buttontextWizzardPadding
                                 text: JamiStrings.setPassword
                                 primary: true
 
@@ -314,6 +320,7 @@ Rectangle {
                                     id: labelEncrypt
                                     visible: !openedPassword && !openedNickname
                                     Layout.fillWidth: true
+                                    Layout.rightMargin: 20
 
                                     text: JamiStrings.encryptAccount
                                     wrapMode: Text.WordWrap
@@ -525,6 +532,7 @@ Rectangle {
                                     text: JamiStrings.customizeProfile
                                     font.pixelSize: JamiTheme.creditsTextSize
                                     Layout.fillWidth: true
+                                    Layout.rightMargin: 20
                                     wrapMode: Text.WordWrap
                                 }
                             }
@@ -552,7 +560,7 @@ Rectangle {
                     id: showAdvancedButton
 
                     TextMetrics{
-                        id: textSize
+                        id: showAdvancedButtonTextSize
                         font.weight: Font.Bold
                         font.pixelSize: JamiTheme.wizardViewDescriptionFontPixelSize
                         text: showAdvancedButton.text
@@ -563,7 +571,7 @@ Rectangle {
                     Layout.bottomMargin: JamiTheme.wizardViewPageBackButtonMargins
                     Layout.topMargin: JamiTheme.wizardViewBlocMarginSize
 
-                    preferredWidth: textSize.width + 2*JamiTheme.buttontextWizzardPadding + 1
+                    preferredWidth: showAdvancedButtonTextSize.width + 2*JamiTheme.buttontextWizzardPadding + 1
                     text: JamiStrings.optionSave
 
                     onClicked: {