git.iko.soy/unity8
on xenial help sign in
removing rectangle, just leaving mouse area
71269bbDiego Sarmentero
Dash/DashPreview.qml+4−16
compare with xenial
unifiedsplit
@@ -22,7 +22,7 @@ Rectangle {
22
22
23 property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
23 property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
24 property var previewData
24 property var previewData
25− property alias showProcessingAction: waitingForAction.visible
25+ property alias showProcessingAction: waitingForActionMouseArea.visible
26
26
27 property real previewWidthRatio: 0.5
27 property real previewWidthRatio: 0.5
28
28
@@ -198,22 +198,10 @@ Rectangle {
198 sourceComponent: root.header
198 sourceComponent: root.header
199 }
199 }
200
200
201− Rectangle {
201+ MouseArea {
202− id: waitingForAction
202+ id: waitingForActionMouseArea
203− objectName: "waitingForAction"
203+ objectName: "waitingForActionMouseArea"
204 anchors.fill: parent
204 anchors.fill: parent
205− color: "black"
206− opacity: 0.6
207 visible: false
205 visible: false
208−
209− MouseArea {
210− anchors.fill: parent
211− }
212− }
213−
214− ActivityIndicator {
215− anchors.centerIn: waitingForAction
216− visible: waitingForAction.visible
217− running: waitingForAction.visible
218 }
206 }
219}
207}
tests/qmltests/Dash/tst_GenericScopeView.qml+1−1
@@ -72,7 +72,7 @@ Item {
72 previewLoader.open = true;
72 previewLoader.open = true;
73 previewLoader.source = "../../../Dash/Generic/GenericPreview.qml";
73 previewLoader.source = "../../../Dash/Generic/GenericPreview.qml";
74 previewLoader.item.showProcessingAction = true;
74 previewLoader.item.showProcessingAction = true;
75− var waitingForAction = findChild(genericScopeView, "waitingForAction");
75+ var waitingForAction = findChild(genericScopeView, "waitingForActionMouseArea");
76 tryCompare(waitingForAction, "visible", true);
76 tryCompare(waitingForAction, "visible", true);
77 previewLoader.closePreviewSpinner();
77 previewLoader.closePreviewSpinner();
78 tryCompare(waitingForAction, "visible", false);
78 tryCompare(waitingForAction, "visible", false);