git.iko.soy/unity8
on xenial help sign in
fix issues found by kevin
commitca925faf46392c15ef5b20dbd181ea2c94438267 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 11 Feb 2014, 14:30 (13 years ago) parent3ebb5c4
5 files changed+16−7
compare with xenial
unifiedsplit
qml/Launcher/Launcher.qml+2−1 qml/Shell.qml+1−1 qml/Stages/StageWithSideStage.qml+9−3 qml/Stages/SwitchingApplicationImage.qml+3−1 run_on_device+1−1
qml/Launcher/Launcher.qml+2−1
@@ -30,7 +30,8 @@ Item {
3030 property int dragAreaWidth: units.gu(1)
3131 property int minimizeDistance: units.gu(26)
3232 property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
33− (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
33+ (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) :
34+ (dragArea.dragging ? 0.001 : 0)
3435
3536 readonly property bool shown: panel.x > -panel.width
3637
qml/Shell.qml+1−1
@@ -288,7 +288,7 @@ FocusScope {
288288 Binding {
289289 target: applicationsDisplayLoader.item
290290 property: "moving"
291− value: !stages.fullyShown
291+ value: !stages.fullyShown || launcher.progress > 0
292292 }
293293 Binding {
294294 target: applicationsDisplayLoader.item
qml/Stages/StageWithSideStage.qml+9−3
@@ -34,7 +34,7 @@ Item {
3434 }
3535
3636 onMovingChanged: {
37−// print("moving", moving, priv.haveMainStageApp, priv.haveSideStageApp)
37+ print("moving", moving, priv.haveMainStageApp, priv.haveSideStageApp)
3838 if (moving) {
3939 if (!priv.mainStageAppId && !priv.sideStageAppId) {
4040 // Pulling in from the right, make the last used (topmost) app visible
@@ -253,7 +253,8 @@ Item {
253253
254254 SwitchingApplicationImage {
255255 id: mainStageImage
256− height: parent.height
256+// height: parent.height
257+ anchors.bottom: parent.bottom
257258 width: parent.width
258259 visible: false
259260
@@ -289,6 +290,11 @@ Item {
289290
290291 onMouseXChanged: {
291292 dragPoints.push(mouseX)
293+ print("mouseX changed. waiting for screenshots", priv.waitingForScreenshots)
294+ if (priv.waitingForScreenshots) {
295+ return;
296+ }
297+
292298 var dragPoint = root.width + mouseX;
293299 if (sideStageImage.shown) {
294300 dragPoint -= sideStageImage.width
@@ -323,7 +329,7 @@ Item {
323329 SwitchingApplicationImage {
324330 id: sideStageImage
325331 width: priv.sideStageWidth
326−// height: root.height
332+ height: root.height
327333 x: root.width - width
328334 anchors.bottom: parent.bottom
329335 visible: true
qml/Stages/SwitchingApplicationImage.qml+3−1
@@ -1,10 +1,11 @@
11import QtQuick 2.0
22import Ubuntu.Components 0.1
33
4−Item {
4+Rectangle {
55 id: root
66 implicitHeight: image.implicitHeight
77 implicitWidth: image.implicitWidth
8+ color: "black"
89
910 property var application
1011 onApplicationChanged: print("setting app to", application.appId, application.screenshot)
@@ -42,6 +43,7 @@ Item {
4243 source: root.application ? root.application.screenshot : ""
4344 width: root.width
4445 height: sourceSize.height
46+ anchors.bottom: parent.bottom
4547
4648 }
4749// Rectangle { anchors.fill: parent; color: "yellow" }
run_on_device+1−1
@@ -103,7 +103,7 @@ run() {
103103 ARGS="$ARGS -k"
104104 fi
105105
106− exec_with_ssh "killall -9 dialer-app; killall -9 gallery-app; killall -9 messaging-app; killall -9 address-book-app"
106+ exec_with_ssh "killall -9 dialer-app; killall -9 gallery-app; killall -9 messaging-app; killall -9 address-book-app; killall -9 webbrowser-app"
107107 exec_with_ssh "stop unity8"
108108 exec_with_ssh "start maliit-server"
109109 exec_with_ssh "cd $CODE_DIR/ && ./run $ARGS -- $RUN_OPTIONS"