Skip to content
Snippets Groups Projects
Commit 81112ff1 authored by Fadi Shehadeh's avatar Fadi Shehadeh Committed by Page Magnier-Slimani
Browse files

RTL: Popup layout fix

Reorganized layout margins for BaseModelDialog and adapted affected components.

GitLab: #1946
Change-Id: I36d0a99fb81fd645cdcdd33a3d10ccea6d4c0424
parent b63eb384
No related branches found
No related tags found
No related merge requests found
...@@ -56,11 +56,11 @@ Popup { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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
......
...@@ -35,7 +35,7 @@ BaseModalDialog { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -67,4 +67,3 @@ BaseModalDialog {
} }
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment