rework on `TaskHistoryForm`

3 files changed, 65 insertions, 66 deletions

diff --git a/features/TaskBriefForm.ui.qml b/features/TaskBriefForm.ui.qml
index fe313c7..6653379 100644
--- a/features/TaskBriefForm.ui.qml
+++ b/features/TaskBriefForm.ui.qml
@@ -4,7 +4,7 @@ import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.12
 import QtGraphicalEffects 1.0
 
-Page {
+Item {
     id: taskBriefComponents
     height: ticketSubjectLayout.height + ticketMetaLayout.height
     property alias ticketSubject: ticketSubject
@@ -13,10 +13,6 @@ Page {
     property alias ticketCreatedText: ticketCreatedText
     property alias ticketCreatedTimestamp: ticketCreatedTimestamp
 
-    background: Rectangle {
-        color: "#FFFFFF"
-    }
-
     RowLayout {
         id: ticketSubjectLayout
         height: ticketSubject.height + 32
@@ -49,7 +45,6 @@ Page {
             Layout.leftMargin: 16
             Layout.topMargin: 8
             spacing: 8
-            Layout.fillWidth: true
 
             Image {
                 id: userAvatar
@@ -94,7 +89,7 @@ Page {
             id: ticketCreatedTimestamp
             text: qsTr("2017-07-25 14:05:30")
             Layout.bottomMargin: 16
-            Layout.fillHeight: true
+            Layout.fillHeight: false
             Layout.leftMargin: 16
             font.pixelSize: 12
             font.family: "Work Sans"
diff --git a/features/TaskDetailForm.ui.qml b/features/TaskDetailForm.ui.qml
index 175432a..e032321 100644
--- a/features/TaskDetailForm.ui.qml
+++ b/features/TaskDetailForm.ui.qml
@@ -6,10 +6,13 @@ import QtQuick.Layouts 1.12
 Page {
     id: page
     title: qsTr("Task detail page")
+    background: Rectangle {
+        color: "#FFFFFF"
+    }
 
     property alias backButton: backButton
-    property alias listView: listView
     property alias ticketBriefForm: ticketBriefForm
+    property alias listView: listView
 
     header: ToolBar {
         background: Rectangle {
@@ -36,10 +39,12 @@ Page {
     }
     ScrollView {
         id: contentView
-        anchors.fill: parent
-        background: Rectangle {
-            color: "#FFFFFF"
-        }
+        anchors.right: parent.right
+        anchors.rightMargin: 0
+        anchors.left: parent.left
+        anchors.leftMargin: 0
+        anchors.top: parent.top
+        anchors.topMargin: 0
         TaskBriefForm {
             id: ticketBriefForm
             anchors.top: parent.top
@@ -72,18 +77,14 @@ Page {
         }
         ListView {
             id: listView
+            keyNavigationWraps: true
+            interactive: true
             anchors.right: parent.right
             anchors.rightMargin: 0
             anchors.left: parent.left
             anchors.leftMargin: 0
             anchors.top: separator.bottom
             anchors.topMargin: 0
-            Rectangle {
-                color: "#eeeeee"
-                z: -1
-                anchors.fill: parent
-            }
-            spacing: 0
         }
     }
 }
diff --git a/features/TaskHistoryForm.ui.qml b/features/TaskHistoryForm.ui.qml
index 23b5a30..9a95396 100644
--- a/features/TaskHistoryForm.ui.qml
+++ b/features/TaskHistoryForm.ui.qml
@@ -3,63 +3,66 @@ import QtQuick.Controls 2.12
 import QtQuick.Controls.Material 2.12
 import QtQuick.Layouts 1.12
 
-Page {
-    id: page
-    height: ticketDescriptionLayout.height
+ColumnLayout {
+    id: ticketDescriptionLayout
     property alias creatorText: creatorText
     property alias ticketDescription: ticketDescription
     property alias ticketDate: ticketDate
+    anchors.right: parent.right
+    anchors.rightMargin: 0
+    anchors.left: parent.left
+    anchors.leftMargin: 0
+    spacing: 8
 
-    ColumnLayout {
-        id: ticketDescriptionLayout
-        anchors.right: parent.right
-        anchors.rightMargin: 0
-        anchors.left: parent.left
-        anchors.leftMargin: 0
+    RowLayout {
+        Layout.topMargin: 8
         spacing: 8
-        RowLayout {
-            Layout.topMargin: 8
-            spacing: 8
-            Text {
-                id: creatorText
-                text: qsTr("Username")
-                Layout.rightMargin: 0
-                Layout.fillWidth: true
-                Layout.bottomMargin: 0
-                Layout.topMargin: 0
-                font.weight: Font.Medium
-                font.pixelSize: 14
-                font.family: "Work Sans"
-                Layout.leftMargin: 16
-            }
-            Text {
-                id: ticketDate
-                text: qsTr("2017-07-25 15:05:30")
-                horizontalAlignment: Text.AlignRight
-                Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-                Layout.bottomMargin: 0
-                Layout.topMargin: 0
-                Layout.fillWidth: false
-                Layout.leftMargin: 0
-                Layout.rightMargin: 16
-                font.pixelSize: 12
-                font.family: "Work Sans"
-                color: "#8a000000"
-            }
-        }
         Text {
-            id: ticketDescription
-            text: qsTr("You may put ticket activity description here. Such as editing, commenting, or updating the ticket status.")
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            Layout.leftMargin: 16
-            Layout.rightMargin: 16
-            Layout.bottomMargin: 8
-            Layout.topMargin: 0
+            id: creatorText
+            text: qsTr("Username")
+            Layout.rightMargin: 0
             Layout.fillWidth: true
+            Layout.bottomMargin: 0
+            Layout.topMargin: 0
+            font.weight: Font.Medium
             font.pixelSize: 14
             font.family: "Work Sans"
-            width: ticketDescription.width
-            color: "#000000"
+            Layout.leftMargin: 16
         }
+        Text {
+            id: ticketDate
+            text: qsTr("2017-07-25 15:05:30")
+            horizontalAlignment: Text.AlignRight
+            Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+            Layout.bottomMargin: 0
+            Layout.topMargin: 0
+            Layout.fillWidth: false
+            Layout.leftMargin: 0
+            Layout.rightMargin: 16
+            font.pixelSize: 12
+            font.family: "Work Sans"
+            color: "#8a000000"
+        }
+    }
+    Text {
+        id: ticketDescription
+        text: qsTr("You may put ticket activity description here. Such as editing, commenting, or updating the ticket status.")
+        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+        Layout.leftMargin: 16
+        Layout.rightMargin: 16
+        Layout.bottomMargin: 8
+        Layout.topMargin: 0
+        Layout.fillWidth: true
+        font.pixelSize: 14
+        font.family: "Work Sans"
+        width: ticketDescription.width
+        color: "#000000"
     }
 }
+
+/*##^##
+Designer {
+    D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
+