From 59c8eadb8ac0da12f52709a557776b412ee79b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 25 Aug 2020 21:32:41 -0400
Subject: [PATCH] recordbox: move to correct position
Change-Id: Ic5bad27e2d20f6c84b1defe4c37c0328000bb1af
Gitlab: #26
---
src/mainview/MainView.qml | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 1625b4333..315e3ed7f 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -592,21 +592,29 @@ Window {
&& mainViewStack.visible) {
mainViewStack.pop()
}
+ recordBox.visible = false
}
Component.onCompleted: {
sidePanelViewStack.SplitView.maximumWidth = Qt.binding(function() {
- return (hiddenView ? splitView.width : splitView.width - sidePanelViewStackPreferedWidth)
+ return (hiddenView ? splitView.width :
+ splitView.width - sidePanelViewStackPreferedWidth)
})
recordBox.x = Qt.binding(function() {
- var i = (welcomeViewStack.width > 1000 ? Math.round((welcomeViewStack.width-1000)*0.5) : 0)
- return sidePanelViewStack.width + recordBox.x_offset + i
+ var i = ((mainViewStack.visible && mainViewStack.width > 1000) ?
+ Math.round((mainViewStack.width-1000)*0.5) :
+ 0)
+ return mainViewStack.visible ?
+ sidePanelViewStack.width + recordBox.x_offset + i :
+ recordBox.x_offset + i
+
})
recordBox.y = Qt.binding(function() {
- return sidePanelViewStack.height + recordBox.y_offset
+ return mainViewStack.visible ? mainViewStack.height + recordBox.y_offset :
+ sidePanelViewStack.height + recordBox.y_offset
})
@@ -681,17 +689,6 @@ Window {
RecordBox{
id: recordBox
visible: false
-
- Component.onCompleted: {
- recordBox.x = Qt.binding(function() {
- var i = (mainViewStack.width > 1000 ? Math.round((mainViewStack.width-1000)*0.5) : 0)
- return sidePanelViewStack.width + recordBox.x_offset + i
- })
-
- recordBox.y = Qt.binding(function() {
- return mainViewStack.height + recordBox.y_offset
- })
- }
}
UserProfile {
--
GitLab