ca925fa · unity8 · git.iko.soy

qml/Launcher/Launcher.qml+2−1

compare with xenial

unifiedsplit

@@ -30,7 +30,8 @@ Item {

30 property int dragAreaWidth: units.gu(1)

31 property int minimizeDistance: units.gu(26)

32 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)

34

35

35 readonly property bool shown: panel.x > -panel.width

36 readonly property bool shown: panel.x > -panel.width

36

37

qml/Shell.qml+1−1

@@ -288,7 +288,7 @@ FocusScope {

288 Binding {

289 target: applicationsDisplayLoader.item

290 property: "moving"

291− value: !stages.fullyShown

291+ value: !stages.fullyShown || launcher.progress > 0

292 }

293 Binding {

294 target: applicationsDisplayLoader.item

qml/Stages/StageWithSideStage.qml+9−3

@@ -34,7 +34,7 @@ Item {

34 }

35

36 onMovingChanged: {

37−// print("moving", moving, priv.haveMainStageApp, priv.haveSideStageApp)

37+ print("moving", moving, priv.haveMainStageApp, priv.haveSideStageApp)

38 if (moving) {

39 if (!priv.mainStageAppId && !priv.sideStageAppId) {

40 // Pulling in from the right, make the last used (topmost) app visible

@@ -253,7 +253,8 @@ Item {

253

254 SwitchingApplicationImage {

255 id: mainStageImage

256− height: parent.height

256+// height: parent.height

257+ anchors.bottom: parent.bottom

257 width: parent.width

258 width: parent.width

258 visible: false

259 visible: false

259

260

@@ -289,6 +290,11 @@ Item {

289

290

290 onMouseXChanged: {

291 onMouseXChanged: {

291 dragPoints.push(mouseX)

292 dragPoints.push(mouseX)

293+ print("mouseX changed. waiting for screenshots", priv.waitingForScreenshots)

294+ if (priv.waitingForScreenshots) {

295+ return;

296+ }

297+

292 var dragPoint = root.width + mouseX;

298 var dragPoint = root.width + mouseX;

293 if (sideStageImage.shown) {

299 if (sideStageImage.shown) {

294 dragPoint -= sideStageImage.width

300 dragPoint -= sideStageImage.width

@@ -323,7 +329,7 @@ Item {

323 SwitchingApplicationImage {

329 SwitchingApplicationImage {

324 id: sideStageImage

330 id: sideStageImage

325 width: priv.sideStageWidth

331 width: priv.sideStageWidth

326−// height: root.height

332+ height: root.height

327 x: root.width - width

333 x: root.width - width

328 anchors.bottom: parent.bottom

334 anchors.bottom: parent.bottom

329 visible: true

335 visible: true

qml/Stages/SwitchingApplicationImage.qml+3−1

@@ -1,10 +1,11 @@

1import QtQuick 2.0

2import Ubuntu.Components 0.1

3

4−Item {

4+Rectangle {

5 id: root

6 implicitHeight: image.implicitHeight

7 implicitWidth: image.implicitWidth

8+ color: "black"

8

9

9 property var application

10 property var application

10 onApplicationChanged: print("setting app to", application.appId, application.screenshot)

11 onApplicationChanged: print("setting app to", application.appId, application.screenshot)

@@ -42,6 +43,7 @@ Item {

42 source: root.application ? root.application.screenshot : ""

43 source: root.application ? root.application.screenshot : ""

43 width: root.width

44 width: root.width

44 height: sourceSize.height

45 height: sourceSize.height

46+ anchors.bottom: parent.bottom

45

47

46 }

48 }

47// Rectangle { anchors.fill: parent; color: "yellow" }

49// Rectangle { anchors.fill: parent; color: "yellow" }

run_on_device+1−1

@@ -103,7 +103,7 @@ run() {

103 ARGS="$ARGS -k"

104 fi

105

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"

107 exec_with_ssh "stop unity8"

108 exec_with_ssh "start maliit-server"

109 exec_with_ssh "cd $CODE_DIR/ && ./run $ARGS -- $RUN_OPTIONS"