on xenial help sign in
Fix design notes
8e8ec8eMichael Terry
qml/Shell.qml+1−1
@@ -168,7 +168,7 @@ Item {
168 }
168 }
169
169
170 GlobalShortcut {
170 GlobalShortcut {
171− // dummy shortcut to force creation of GlobalShortcutRegistry before WindowKeyFilter
171+ // dummy shortcut to force creation of GlobalShortcutRegistry before WindowInputFilter
172 }
172 }
173
173
174 WindowInputFilter {
174 WindowInputFilter {
qml/Stages/AbstractStage.qml+1−1
@@ -28,7 +28,7 @@ Rectangle {
28 property url background
28 property url background
29 property bool beingResized
29 property bool beingResized
30 property int dragAreaWidth
30 property int dragAreaWidth
31− property real dragProgress
31+ property real dragProgress // How far left the stage has been dragged, used externally by tutorial code
32 property bool interactive
32 property bool interactive
33 property real inverseProgress // This is the progress for left edge drags, in pixels.
33 property real inverseProgress // This is the progress for left edge drags, in pixels.
34 property bool keepDashRunning: true
34 property bool keepDashRunning: true
qml/Stages/PhoneStage.qml+1−1
@@ -83,7 +83,7 @@ AbstractStage {
83 && !(priv.focusedAppDelegate && priv.focusedAppDelegate.xBehavior.running)
83 && !(priv.focusedAppDelegate && priv.focusedAppDelegate.xBehavior.running)
84 && spreadView.phase === 0
84 && spreadView.phase === 0
85
85
86− // How far left the stage has been dragged
86+ // How far left the stage has been dragged, used externally by tutorial code
87 dragProgress: spreadRepeater.count > 0 ? spreadRepeater.itemAt(0).animatedProgress : 0
87 dragProgress: spreadRepeater.count > 0 ? spreadRepeater.itemAt(0).animatedProgress : 0
88
88
89 readonly property alias dragging: spreadDragArea.dragging
89 readonly property alias dragging: spreadDragArea.dragging
qml/Stages/TabletStage.qml+2
@@ -74,6 +74,8 @@ AbstractStage {
74 }
74 }
75
75
76 orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
76 orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
77+
78+ // How far left the stage has been dragged, used externally by tutorial code
77 dragProgress: spreadRepeater.count > 0 ? spreadRepeater.itemAt(0).animatedProgress : 0
79 dragProgress: spreadRepeater.count > 0 ? spreadRepeater.itemAt(0).animatedProgress : 0
78
80
79 onWidthChanged: {
81 onWidthChanged: {
qml/Tutorial/TutorialBottom.qml+2−2
@@ -58,8 +58,8 @@ TutorialPage {
58 }
58 }
59
59
60 background {
60 background {
61− sourceSize.height: 1080
61+ sourceSize.height: 1916
62− sourceSize.width: 1916
62+ sourceSize.width: 1080
63 source: Qt.resolvedUrl("graphics/background2.png")
63 source: Qt.resolvedUrl("graphics/background2.png")
64 rotation: 180
64 rotation: 180
65 }
65 }
qml/Tutorial/TutorialLeft.qml+2−2
@@ -30,8 +30,8 @@ TutorialPage {
30 }
30 }
31
31
32 background {
32 background {
33− sourceSize.height: 1080
33+ sourceSize.height: 1916
34− sourceSize.width: 1916
34+ sourceSize.width: 1080
35 source: Qt.resolvedUrl("graphics/background1.png")
35 source: Qt.resolvedUrl("graphics/background1.png")
36 mirror: true
36 mirror: true
37 }
37 }
qml/Tutorial/TutorialRight.qml+2−2
@@ -38,8 +38,8 @@ TutorialPage {
38 }
38 }
39
39
40 background {
40 background {
41− sourceSize.height: 1080
41+ sourceSize.height: 1916
42− sourceSize.width: 1916
42+ sourceSize.width: 1080
43 source: Qt.resolvedUrl("graphics/background1.png")
43 source: Qt.resolvedUrl("graphics/background1.png")
44 }
44 }
45
45
qml/Tutorial/TutorialTop.qml+2−2
@@ -36,8 +36,8 @@ TutorialPage {
36 }
36 }
37
37
38 background {
38 background {
39− sourceSize.height: 1080
39+ sourceSize.height: 1916
40− sourceSize.width: 1916
40+ sourceSize.width: 1080
41 source: Qt.resolvedUrl("graphics/background2.png")
41 source: Qt.resolvedUrl("graphics/background2.png")
42 }
42 }
43
43