git.iko.soy/unity8
on xenial help sign in
some more progress on making the tablet right edge work
commitc9d806cb7ccb1f26c31453f473131d268afcd5ae authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 30 May 2014, 09:04 (12 years ago) parent6586a0b
5 files changed+8−14
compare with xenial
unifiedsplit
qml/Shell.qml−5 qml/Stages/PhoneStage.qml+1−3 qml/Stages/SpreadDelegate.qml+2−1 qml/Stages/TabletStage.qml+3−5 run_on_device.sh+2
qml/Shell.qml−5
@@ -230,11 +230,6 @@ FocusScope {
230230
231231 source: shell.sideStageEnabled ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
232232
233− Binding {
234− target: applicationsDisplayLoader.item
235− property: "applications"
236− value: ApplicationManager
237− }
238233 Binding {
239234 target: applicationsDisplayLoader.item
240235 property: "dragAreaWidth"
qml/Stages/PhoneStage.qml+1−3
@@ -28,7 +28,6 @@ Rectangle {
2828 // Controls to be set from outside
2929 property int dragAreaWidth
3030 property real maximizedAppTopMargin
31− property var applications
3231
3332 // State information propagated to the outside
3433 property bool fullscreen: priv.focusedApplication ? priv.focusedApplication.fullscreen : false
@@ -228,7 +227,7 @@ Rectangle {
228227
229228 Repeater {
230229 id: spreadRepeater
231− model: root.applications
230+ model: ApplicationManager
232231 delegate: TransformedSpreadDelegate {
233232 id: appDelegate
234233 objectName: "appDelegate" + index
@@ -242,7 +241,6 @@ Rectangle {
242241 height: spreadView.height
243242 selected: spreadView.selectedIndex == index
244243 otherSelected: spreadView.selectedIndex >= 0 && !selected
245− application: root.applications.get(index)
246244 interactive: !spreadView.interactive
247245 maximizedAppTopMargin: root.maximizedAppTopMargin
248246
qml/Stages/SpreadDelegate.qml+2−1
@@ -26,13 +26,14 @@ Item {
2626 property real topMarginProgress
2727 property bool interactive: true
2828 property real maximizedAppTopMargin
29− property var application
29+ property var application: ApplicationManager.get(index)
3030
3131 // FIXME: This really should be invisible to QML code.
3232 // e.g. Create a SurfaceItem {} in C++ which we just use without any imperative hacks.
3333 property var surface: application ? application.surface : null
3434 onSurfaceChanged: {
3535 if (surface) {
36+ print("########################## surface created!")
3637 surface.parent = root;
3738 surface.enabled = root.interactive;
3839 surface.z = 1;
qml/Stages/TabletStage.qml+3−5
@@ -17,7 +17,7 @@
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
1919import Ubuntu.Gestures 0.1
20−import Unity.Application 0.1
20+import Mir.Application 0.1
2121import Utils 0.1
2222import "../Components"
2323
@@ -36,9 +36,8 @@ Item {
3636 property bool fullscreen: true
3737 property bool overlayMode: false
3838
39− readonly property int overlayWidth: priv.overlayOverride ? 0 : priv.sideStageWidth
39+ readonly property int overlayWidth: priv.overlayOverride ? 0 : spreadView.sideStageWidth
4040
41− property var surfaces
4241 property real maximizedAppTopMargin
4342
4443 QtObject {
@@ -249,7 +248,7 @@ Item {
249248
250249 Repeater {
251250 id: spreadRepeater
252− model: root.surfaces
251+ model: ApplicationManager
253252
254253 delegate: Rectangle {
255254 height: spreadView.height
@@ -292,7 +291,6 @@ Item {
292291 selected: spreadView.selectedIndex == index
293292 otherSelected: spreadView.selectedIndex >= 0 && !selected
294293 isInSideStage: priv.sideStageAppId == model.appId
295− surface: model.surface
296294 interactive: !spreadView.interactive
297295 maximizedAppTopMargin: root.maximizedAppTopMargin
298296
run_on_device.sh+2
@@ -103,6 +103,8 @@ run() {
103103 ARGS="$ARGS -k"
104104 fi
105105
106+ exec_with_ssh "for i in `upstart-app-list`; do upstart-app-stop $i; done"
107+
106108 exec_with_ssh "stop unity8"
107109 exec_with_ssh "start maliit-server"
108110 exec_with_ssh "cd $CODE_DIR/ && ./run.sh $ARGS -- $RUN_OPTIONS"