From 75de73c016abbf9847a65702eeb676d607973598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Sun, 29 Sep 2019 23:39:53 +0800 Subject: Move the brief and history forms and its container so that the TaskDetails can have access to their properties --- TaskDetails.qml | 26 ++++++++++++++++++++++++++ larva | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/TaskDetails.qml b/TaskDetails.qml index 94162f6..577f908 100644 --- a/TaskDetails.qml +++ b/TaskDetails.qml @@ -6,6 +6,32 @@ import "larva/features" TaskDetailForm { backButton.onClicked: pageView.pop() + + StackView { + id: contentView + anchors.fill: parent + + TaskBriefForm { + id: taskBriefForm + anchors.top: parent.top + anchors.topMargin: 0 + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 0 + ticketSubject.text: subject + } + + TaskHistoryForm { + id: taskHistoryForm + anchors.right: parent.right + anchors.rightMargin: 0 + anchors.left: parent.left + anchors.leftMargin: 0 + anchors.top: taskBriefForm.bottom + anchors.topMargin: 0 + } + } } /*##^## diff --git a/larva b/larva index f265b7f..04df88e 160000 --- a/larva +++ b/larva @@ -1 +1 @@ -Subproject commit f265b7fdb808e16c58cca1e3027387be4279a63d +Subproject commit 04df88e0e5db34066a626a02dbe9960b55267e6b -- cgit v1.2.3