git.iko.soy/unity8
on xenial help sign in
removed loader
dbe8861Andrea Cimitan
qml/Dash/PreviewView.qml+8−29
compare with xenial
unifiedsplit
@@ -26,14 +26,9 @@ Item {
26 property bool open: false
26 property bool open: false
27 property var scope: null
27 property var scope: null
28 property var scopeStyle: null
28 property var scopeStyle: null
29−
30 property alias showSignatureLine: header.showSignatureLine
29 property alias showSignatureLine: header.showSignatureLine
31−
30+ property alias previewModel: preview.previewModel
32− property alias currentItem: previewLoader.item
33− property var previewModel
34−
35− readonly property bool processing: currentItem && (!currentItem.previewModel.loaded
31+ readonly property bool processing: previewModel && (!previewModel.loaded || previewModel.processingAction)
36− || currentItem.previewModel.processingAction)
37
32
38 signal backClicked()
33 signal backClicked()
39
34
@@ -51,47 +46,31 @@ Item {
51
46
52 onOpenChanged: {
47 onOpenChanged: {
53 if (!open) {
48 if (!open) {
54− // Cancel any pending preview requests or actions
55− if (currentItem && currentItem.previewData !== undefined) {
56− currentItem.previewData.cancelAction();
57− }
58 root.scope.cancelActivation();
49 root.scope.cancelActivation();
59 }
50 }
60 }
51 }
61
52
62− Loader {
53+ Previews.Preview {
63− id: previewLoader
54+ id: preview
64− objectName: "loader"
55+ objectName: "preview"
65 anchors {
56 anchors {
66 top: header.bottom
57 top: header.bottom
67 bottom: parent.bottom
58 bottom: parent.bottom
68 left: parent.left
59 left: parent.left
69 right: parent.right
60 right: parent.right
70 }
61 }
71−
62+ scopeStyle: root.scopeStyle
72− sourceComponent: Previews.Preview {
73− id: preview
74− objectName: "preview"
75− height: previewLoader.height
76− width: previewLoader.width
77− }
78−
79− onLoaded: {
80− item.scopeStyle = Qt.binding(function() { return root.scopeStyle; });
81− item.previewModel = Qt.binding(function() { return root.previewModel; });
82− }
83 }
63 }
84
64
85 MouseArea {
65 MouseArea {
86 id: processingMouseArea
66 id: processingMouseArea
87 objectName: "processingMouseArea"
67 objectName: "processingMouseArea"
88 anchors {
68 anchors {
89− left: parent.left
90− right: parent.right
91 top: header.bottom
69 top: header.bottom
92 bottom: parent.bottom
70 bottom: parent.bottom
71+ left: parent.left
72+ right: parent.right
93 }
73 }
94−
95 enabled: root.processing
74 enabled: root.processing
96 }
75 }
97}
76}
tests/qmltests/Dash/tst_PreviewView.qml+1−2
@@ -86,8 +86,7 @@ Rectangle {
86 }
86 }
87
87
88 function test_processing() {
88 function test_processing() {
89− verify(view.currentItem, "currentItem is not ready yet");
90− view.currentItem.previewModel.setLoaded(false);
89+ view.previewModel.setLoaded(false);
91
90
92 tryCompare(view, "processing", true);
91 tryCompare(view, "processing", true);
93
92