git.iko.soy/unity8
on xenial help sign in
drop some unused code
commit461f9ec2454f9c1ce8df40d8c89a901bcbf56b50 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 20 Sep 2016, 14:01 (10 years ago) parent1930962
3 files changed−150
compare with xenial
unifiedsplit
qml/Stage/ApplicationWindow.qml−28 qml/Stage/Spread/SpreadDelegateInputArea.qml−94 qml/Stage/SurfaceContainer.qml−28
qml/Stage/ApplicationWindow.qml−28
@@ -234,28 +234,6 @@ FocusScope {
234234 property Item first: null
235235 }
236236
237−// // SurfaceContainer size drives ApplicationWindow size
238−// Binding {
239−// target: root; property: "implicitWidth"
240−// value: stateGroup.state === "surface" ? surfaceContainer.implicitWidth : root.requestedWidth
241−// when: root.requestedWidth >= 0
242−// }
243−// Binding {
244−// target: root; property: "implicitHeight"
245−// value: stateGroup.state === "surface" ? surfaceContainer.implicitHeight : root.requestedHeight
246−// when: root.requestedHeight >= 0
247−// }
248−
249−// // ApplicationWindow size drives SurfaceContainer size
250−// Binding {
251−// target: surfaceContainer; property: "width"; value: root.width
252−// when: root.requestedWidth < 0
253−// }
254−// Binding {
255−// target: surfaceContainer; property: "height"; value: root.height
256−// when: root.requestedHeight < 0
257−// }
258−
259237 StateGroup {
260238 id: stateGroup
261239 objectName: "applicationWindowStateGroup"
@@ -424,10 +402,4 @@ FocusScope {
424402 }
425403 ]
426404 }
427−
428−// Rectangle {
429−// anchors.fill: parent
430−// color: "yellow"
431−// opacity: .4
432−// }
433405}
qml/Stage/Spread/SpreadDelegateInputArea.qml−94
@@ -165,97 +165,3 @@ Item {
165165 }
166166 }
167167}
168−
169−//DraggingArea {
170−// id: root
171−// onPressed: mouse.accepted = true;
172−// hoverEnabled: true
173−
174−
175−// property bool closeable: true
176−
177−// property bool moving: false
178−// property real distance: 0
179−// readonly property int threshold: units.gu(2)
180−// property int offset: 0
181−
182−// readonly property real minSpeedToClose: units.gu(40)
183−
184−// signal close();
185−
186−// onMouseYChanged: {
187−// if (pressed) {
188−// appDelegate.y
189−// }
190−// }
191−
192−// onDragValueChanged: {
193−// if (!dragging) {
194−// return;
195−// }
196−// moving = moving || Math.abs(dragValue) > threshold;
197−// if (moving) {
198−// distance = dragValue + offset;
199−// }
200−// }
201−
202−// onMovingChanged: {
203−// if (moving) {
204−// offset = (dragValue > 0 ? -threshold: threshold)
205−// } else {
206−// offset = 0;
207−// }
208−// }
209−
210−// onDragEnd: {
211−// if (!root.closeable) {
212−// animation.animate("center")
213−// return;
214−// }
215−
216−// // velocity and distance values specified by design prototype
217−// if ((dragVelocity < -minSpeedToClose && distance < -units.gu(8)) || distance < -root.height / 2) {
218−// animation.animate("up")
219−// } else if ((dragVelocity > minSpeedToClose && distance > units.gu(8)) || distance > root.height / 2) {
220−// animation.animate("down")
221−// } else {
222−// animation.animate("center")
223−// }
224−// }
225−
226−// UbuntuNumberAnimation {
227−// id: animation
228−// objectName: "closeAnimation"
229−// target: dragArea
230−// property: "distance"
231−// property bool requestClose: false
232−
233−// function animate(direction) {
234−// animation.from = dragArea.distance;
235−// switch (direction) {
236−// case "up":
237−// animation.to = -root.height * 1.5;
238−// requestClose = true;
239−// break;
240−// case "down":
241−// animation.to = root.height * 1.5;
242−// requestClose = true;
243−// break;
244−// default:
245−// animation.to = 0
246−// }
247−// animation.start();
248−// }
249−
250−// onRunningChanged: {
251−// if (!running) {
252−// dragArea.moving = false;
253−// if (requestClose) {
254−// root.close();
255−// } else {
256−// dragArea.distance = 0;
257−// }
258−// }
259−// }
260−// }
261−//}
qml/Stage/SurfaceContainer.qml−28
@@ -81,34 +81,6 @@ FocusScope {
8181 enabled: surfaceItem.enabled
8282 }
8383
84−// // MirSurface size drives SurfaceContainer size
85−// Binding {
86−// target: surfaceItem; property: "width"; value: root.surface ? root.surface.size.width : 0
87−// when: root.requestedWidth >= 0 && root.surface
88−// }
89−// Binding {
90−// target: surfaceItem; property: "height"; value: root.surface ? root.surface.size.height : 0
91−// when: root.requestedHeight >= 0 && root.surface
92−// }
93−// Binding {
94−// target: root; property: "implicitWidth"; value: surfaceItem.width
95−// when: root.requestedWidth >= 0
96−// }
97−// Binding {
98−// target: root; property: "implicitHeight"; value: surfaceItem.height
99−// when: root.requestedHeight >= 0
100−// }
101−
102−// // SurfaceContainer size drives MirSurface size
103−// Binding {
104−// target: surfaceItem; property: "width"; value: root.width
105−// when: root.requestedWidth < 0
106−// }
107−// Binding {
108−// target: surfaceItem; property: "height"; value: root.height
109−// when: root.requestedHeight < 0
110−// }
111−
11284 Loader {
11385 id: animationsLoader
11486 objectName: "animationsLoader"