lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-07-27 10:55:34 +02:00
Code Activity

RTL: Popup layout fix

Browse source 
Reorganized layout margins for BaseModelDialog and adapted affected components.

GitLab: #1946
Change-Id: I36d0a99fb81fd645cdcdd33a3d10ccea6d4c0424
This commit is contained in:
Fadi Shehadeh 2025-03-14 13:45:40 -04:00 • committed by Page Magnier-Slimani
parent b63eb384b6
commit 81112ff1f8
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/app/commoncomponents/BaseModalDialog.qml
View file

@ -56,11 +56,11 @@ Popup {
id: container id: container
property color color: JamiTheme.secondaryBackgroundColor property color color: JamiTheme.secondaryBackgroundColor
leftPadding: popupMargins bottomPadding: action1.visible || action2.visible ? 10 : popupMargins
bottomPadding: action1.visible || action2.visible ? 10 :popupMargins
background: Rectangle { background: Rectangle {
id: bgRect id: bgRect
radius: 5 radius: 5
color: container.color color: container.color
layer.enabled: true layer.enabled: true
@ -99,7 +99,7 @@ Popup {
Label { Label {
id: titleText id: titleText
Layout.rightMargin: popupMargins Layout.leftMargin: popupMargins
Layout.bottomMargin: 20 Layout.bottomMargin: 20
Layout.topMargin: closeButtonVisible ? 0 : 30 Layout.topMargin: closeButtonVisible ? 0 : 30
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
@ -115,9 +115,9 @@ Popup {
id: flickable id: flickable
Layout.fillHeight: true Layout.fillHeight: true
Layout.preferredHeight: Math.min(contentHeight, root.height) Layout.preferredHeight: Math.min(contentHeight, root.height)
Layout.preferredWidth: contentItem.childrenRect.width Layout.preferredWidth: contentItem.childrenRect.width
Layout.leftMargin: popupMargins
Layout.rightMargin: popupMargins Layout.rightMargin: popupMargins
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
@ -126,11 +126,13 @@ Popup {
contentItem.children: Loader { contentItem.children: Loader {
id: containerSubContentLoader id: containerSubContentLoader
} }
ScrollBar.horizontal.visible: false ScrollBar.horizontal.visible: false
} }
DialogButtonBox { DialogButtonBox {
id: buttonBox id: buttonBox
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
spacing: 1.5 spacing: 1.5

9
src/app/wizardview/components/GoodToKnowPopup.qml
View file

@ -35,7 +35,7 @@ BaseModalDialog {
InfoBox { InfoBox {
id: info id: info
width: root.width - 2 * root.popupMargins width: parent.width
icoSource: JamiResources.laptop_black_24dp_svg icoSource: JamiResources.laptop_black_24dp_svg
title: JamiStrings.local title: JamiStrings.local
description: JamiStrings.localAccount description: JamiStrings.localAccount
@ -43,7 +43,7 @@ BaseModalDialog {
} }
InfoBox { InfoBox {
width: root.width - 2 * root.popupMargins width: parent.width
icoSource: JamiResources.assignment_ind_black_24dp_svg icoSource: JamiResources.assignment_ind_black_24dp_svg
title: JamiStrings.username title: JamiStrings.username
description: JamiStrings.usernameRecommened description: JamiStrings.usernameRecommened
@ -51,7 +51,7 @@ BaseModalDialog {
} }
InfoBox { InfoBox {
width: root.width - 2 * root.popupMargins width: parent.width
icoSource: JamiResources.lock_svg icoSource: JamiResources.lock_svg
title: JamiStrings.encrypt title: JamiStrings.encrypt
description: JamiStrings.passwordOptional description: JamiStrings.passwordOptional
@ -59,7 +59,7 @@ BaseModalDialog {
} }
InfoBox { InfoBox {
width: root.width - 2 * root.popupMargins width: parent.width
icoSource: JamiResources.brush_black_24dp_svg icoSource: JamiResources.brush_black_24dp_svg
title: JamiStrings.customize title: JamiStrings.customize
description: JamiStrings.customizeOptional description: JamiStrings.customizeOptional
@ -67,4 +67,3 @@ BaseModalDialog {
} }
} }
} }