git.iko.soy/unity8
on xenial help sign in
some more progress on making the tablet right edge work
c9d806cMichael Zanetti
qml/Shell.qml−5
compare with xenial
unifiedsplit
@@ -230,11 +230,6 @@ FocusScope {
230
230
231 source: shell.sideStageEnabled ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
231 source: shell.sideStageEnabled ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
232
232
233− Binding {
234− target: applicationsDisplayLoader.item
235− property: "applications"
236− value: ApplicationManager
237− }
238 Binding {
233 Binding {
239 target: applicationsDisplayLoader.item
234 target: applicationsDisplayLoader.item
240 property: "dragAreaWidth"
235 property: "dragAreaWidth"
qml/Stages/PhoneStage.qml+1−3
@@ -28,7 +28,6 @@ Rectangle {
28 // Controls to be set from outside
28 // Controls to be set from outside
29 property int dragAreaWidth
29 property int dragAreaWidth
30 property real maximizedAppTopMargin
30 property real maximizedAppTopMargin
31− property var applications
32
31
33 // State information propagated to the outside
32 // State information propagated to the outside
34 property bool fullscreen: priv.focusedApplication ? priv.focusedApplication.fullscreen : false
33 property bool fullscreen: priv.focusedApplication ? priv.focusedApplication.fullscreen : false
@@ -228,7 +227,7 @@ Rectangle {
228
227
229 Repeater {
228 Repeater {
230 id: spreadRepeater
229 id: spreadRepeater
231− model: root.applications
230+ model: ApplicationManager
232 delegate: TransformedSpreadDelegate {
231 delegate: TransformedSpreadDelegate {
233 id: appDelegate
232 id: appDelegate
234 objectName: "appDelegate" + index
233 objectName: "appDelegate" + index
@@ -242,7 +241,6 @@ Rectangle {
242 height: spreadView.height
241 height: spreadView.height
243 selected: spreadView.selectedIndex == index
242 selected: spreadView.selectedIndex == index
244 otherSelected: spreadView.selectedIndex >= 0 && !selected
243 otherSelected: spreadView.selectedIndex >= 0 && !selected
245− application: root.applications.get(index)
246 interactive: !spreadView.interactive
244 interactive: !spreadView.interactive
247 maximizedAppTopMargin: root.maximizedAppTopMargin
245 maximizedAppTopMargin: root.maximizedAppTopMargin
248
246
qml/Stages/SpreadDelegate.qml+2−1
@@ -26,13 +26,14 @@ Item {
26 property real topMarginProgress
26 property real topMarginProgress
27 property bool interactive: true
27 property bool interactive: true
28 property real maximizedAppTopMargin
28 property real maximizedAppTopMargin
29− property var application
29+ property var application: ApplicationManager.get(index)
30
30
31 // FIXME: This really should be invisible to QML code.
31 // FIXME: This really should be invisible to QML code.
32 // e.g. Create a SurfaceItem {} in C++ which we just use without any imperative hacks.
32 // e.g. Create a SurfaceItem {} in C++ which we just use without any imperative hacks.
33 property var surface: application ? application.surface : null
33 property var surface: application ? application.surface : null
34 onSurfaceChanged: {
34 onSurfaceChanged: {
35 if (surface) {
35 if (surface) {
36+ print("########################## surface created!")
36 surface.parent = root;
37 surface.parent = root;
37 surface.enabled = root.interactive;
38 surface.enabled = root.interactive;
38 surface.z = 1;
39 surface.z = 1;
qml/Stages/TabletStage.qml+3−5
@@ -17,7 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import Ubuntu.Gestures 0.1
19import Ubuntu.Gestures 0.1
20−import Unity.Application 0.1
20+import Mir.Application 0.1
21import Utils 0.1
21import Utils 0.1
22import "../Components"
22import "../Components"
23
23
@@ -36,9 +36,8 @@ Item {
36 property bool fullscreen: true
36 property bool fullscreen: true
37 property bool overlayMode: false
37 property bool overlayMode: false
38
38
39− readonly property int overlayWidth: priv.overlayOverride ? 0 : priv.sideStageWidth
39+ readonly property int overlayWidth: priv.overlayOverride ? 0 : spreadView.sideStageWidth
40
40
41− property var surfaces
42 property real maximizedAppTopMargin
41 property real maximizedAppTopMargin
43
42
44 QtObject {
43 QtObject {
@@ -249,7 +248,7 @@ Item {
249
248
250 Repeater {
249 Repeater {
251 id: spreadRepeater
250 id: spreadRepeater
252− model: root.surfaces
251+ model: ApplicationManager
253
252
254 delegate: Rectangle {
253 delegate: Rectangle {
255 height: spreadView.height
254 height: spreadView.height
@@ -292,7 +291,6 @@ Item {
292 selected: spreadView.selectedIndex == index
291 selected: spreadView.selectedIndex == index
293 otherSelected: spreadView.selectedIndex >= 0 && !selected
292 otherSelected: spreadView.selectedIndex >= 0 && !selected
294 isInSideStage: priv.sideStageAppId == model.appId
293 isInSideStage: priv.sideStageAppId == model.appId
295− surface: model.surface
296 interactive: !spreadView.interactive
294 interactive: !spreadView.interactive
297 maximizedAppTopMargin: root.maximizedAppTopMargin
295 maximizedAppTopMargin: root.maximizedAppTopMargin
298
296
run_on_device.sh+2
@@ -103,6 +103,8 @@ run() {
103 ARGS="$ARGS -k"
103 ARGS="$ARGS -k"
104 fi
104 fi
105
105
106+ exec_with_ssh "for i in `upstart-app-list`; do upstart-app-stop $i; done"
107+
106 exec_with_ssh "stop unity8"
108 exec_with_ssh "stop unity8"
107 exec_with_ssh "start maliit-server"
109 exec_with_ssh "start maliit-server"
108 exec_with_ssh "cd $CODE_DIR/ && ./run.sh $ARGS -- $RUN_OPTIONS"
110 exec_with_ssh "cd $CODE_DIR/ && ./run.sh $ARGS -- $RUN_OPTIONS"