From 35508069817924e17f099741adcc0f6580a82dac Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Thu, 10 Sep 2020 16:56:47 -0400
Subject: [PATCH] commoncomponents: correct photo booth view geometry
Make sure that in wizard view, the spacing in the profile page is
correct.
Change-Id: I15cc9274b433532621495df4899578afb5efee92
---
src/commoncomponents/PhotoboothView.qml | 6 ++++++
src/wizardview/components/ProfilePage.qml | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/commoncomponents/PhotoboothView.qml b/src/commoncomponents/PhotoboothView.qml
index 42d5b6816..c1bbf72bd 100644
--- a/src/commoncomponents/PhotoboothView.qml
+++ b/src/commoncomponents/PhotoboothView.qml
@@ -16,6 +16,10 @@ ColumnLayout {
property int boothWidth: 224
+ readonly property int size: boothWidth +
+ buttonsRowLayout.height +
+ JamiTheme.preferredMarginSize / 2
+
signal imageAcquired
signal imageCleared
@@ -49,6 +53,8 @@ ColumnLayout {
}
}
+ spacing: 0
+
JamiFileDialog{
id: importFromFileToAvatar_Dialog
diff --git a/src/wizardview/components/ProfilePage.qml b/src/wizardview/components/ProfilePage.qml
index 98f52c0c8..780964ee4 100644
--- a/src/wizardview/components/ProfilePage.qml
+++ b/src/wizardview/components/ProfilePage.qml
@@ -87,8 +87,8 @@ Rectangle {
id: setAvatarWidget
Layout.alignment: Qt.AlignCenter
- Layout.preferredWidth: JamiTheme.preferredFieldHeight + boothWidth
- Layout.preferredHeight: JamiTheme.preferredFieldHeight + boothWidth
+ Layout.preferredWidth: size
+ Layout.preferredHeight: size
boothWidth: 200
}
--
GitLab