git.iko.soy/unity8
on xenial help sign in
Some tiny fixes
commitdf9c576b3779210666e31ea115bab6fe08d38122 authorMichael Terry <michael.terry@canonical.com> dateFri 25 Sep 2015, 16:49 (11 years ago) parent144e568
3 files changed+12−4
compare with xenial
unifiedsplit
qml/Shell.qml+1−1 qml/Tutorial/Tutorial.qml+2−2 qml/Tutorial/TutorialBottom.qml+9−1
qml/Shell.qml+1−1
@@ -406,7 +406,7 @@ Item {
406406 hides: [launcher, panel.indicators]
407407 tabletMode: shell.usageScenario != "phone"
408408 launcherOffset: launcher.progress
409− forcedUnlock: wizard.active
409+ forcedUnlock: wizard.active || tutorial.running
410410 background: shell.background
411411
412412 // avoid overlapping with Launcher's edge drag area
qml/Tutorial/Tutorial.qml+2−2
@@ -54,8 +54,8 @@ Item {
5454 anchors.fill: parent
5555 source: "TutorialContent.qml"
5656
57− // EdgeDragAreas don't work with mice. So to avoid trapping the user,
58− // we skip the tutorial on the Desktop to avoid using them. The
57+ // DirectionalDragAreas don't work with mice. So to avoid trapping the
58+ // user, we skip the tutorial on the Desktop to avoid using them. The
5959 // Desktop doesn't use the same spread design anyway. The tutorial is
6060 // all a bit of a placeholder on non-phone form factors right now.
6161 // When the design team gives us more guidance, we can do something
qml/Tutorial/TutorialBottom.qml+9−1
@@ -36,11 +36,19 @@ TutorialPage {
3636 }
3737
3838 label {
39− text: i18n.tr("Swipe from the bottom edge")
39+ text: i18n.tr("Swipe from the bottom edge to manage the app")
4040 anchors.bottom: arrow.top
4141 anchors.bottomMargin: units.gu(3)
4242 anchors.horizontalCenter: root.horizontalCenter
4343 anchors.horizontalCenterOffset: (label.width - label.contentWidth) / 2
4444 width: root.width - units.gu(8)
4545 }
46+
47+ DirectionalDragArea {
48+ direction: Direction.Upwards
49+ anchors.left: parent.left
50+ anchors.right: parent.right
51+ anchors.bottom: parent.bottom
52+ height: units.gu(1)
53+ }
4654}