From 7059a8cdab8d3c6c2ae56b301952cfee2b4cde34 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 27 May 2021 15:29:24 -0400
Subject: [PATCH] callview: adjust the preview positioning
- move default preview position to top right
- avoid coliding with the new call action bar
Gitlab: #411
Change-Id: Iaa77315be4f6dab28e3161d7dd9b3516c00e4e68
---
src/mainview/components/OngoingCallPage.qml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/mainview/components/OngoingCallPage.qml b/src/mainview/components/OngoingCallPage.qml
index 05584aa9d..c4cec1c0b 100644
--- a/src/mainview/components/OngoingCallPage.qml
+++ b/src/mainview/components/OngoingCallPage.qml
@@ -38,7 +38,8 @@ Rectangle {
property string bestId: "Best Id"
property variant clickPos: "1,1"
property int previewMargin: 15
- property int previewMarginY: previewMargin + 56
+ property int previewMarginYTop: previewMargin + 42
+ property int previewMarginYBottom: previewMargin + 84
property int previewToX: 0
property int previewToY: 0
property bool isAudioOnly: false
@@ -116,26 +117,26 @@ Rectangle {
return callPageMainRect.width - previewRenderer.width - previewMargin
})
previewToY = Qt.binding(function () {
- return callPageMainRect.height - previewRenderer.height - previewMarginY
+ return callPageMainRect.height - previewRenderer.height - previewMarginYBottom
})
} else {
// Top right.
previewToX = Qt.binding(function () {
return callPageMainRect.width - previewRenderer.width - previewMargin
})
- previewToY = previewMarginY
+ previewToY = previewMarginYTop
}
} else {
if (previewRendererCenter.y >= distantRendererCenter.y) {
// Bottom left.
previewToX = previewMargin
previewToY = Qt.binding(function () {
- return callPageMainRect.height - previewRenderer.height - previewMarginY
+ return callPageMainRect.height - previewRenderer.height - previewMarginYBottom
})
} else {
// Top left.
previewToX = previewMargin
- previewToY = previewMarginY
+ previewToY = previewMarginYTop
}
}
previewRenderer.state = "geoChanging"
@@ -219,7 +220,7 @@ Rectangle {
width: Math.max(callPageMainRect.width / 5, JamiTheme.minimumPreviewWidth)
x: callPageMainRect.width - previewRenderer.width - previewMargin
- y: callPageMainRect.height - previewRenderer.height - previewMargin - 56 // Avoid overlay
+ y: previewMarginYTop
states: [
State {
--
GitLab