df9c576 · unity8 · git.iko.soy

qml/Shell.qml+1−1

@@ -406,7 +406,7 @@ Item {

406 hides: [launcher, panel.indicators]

407 tabletMode: shell.usageScenario != "phone"

408 launcherOffset: launcher.progress

409− forcedUnlock: wizard.active

409+ forcedUnlock: wizard.active || tutorial.running

410 background: shell.background

411

412 // avoid overlapping with Launcher's edge drag area

qml/Tutorial/Tutorial.qml+2−2

@@ -54,8 +54,8 @@ Item {

54 anchors.fill: parent

55 source: "TutorialContent.qml"

56

57− // EdgeDragAreas don't work with mice. So to avoid trapping the user,

57+ // DirectionalDragAreas don't work with mice. So to avoid trapping the

58− // we skip the tutorial on the Desktop to avoid using them. The

58+ // user, we skip the tutorial on the Desktop to avoid using them. The

59 // Desktop doesn't use the same spread design anyway. The tutorial is

60 // all a bit of a placeholder on non-phone form factors right now.

61 // When the design team gives us more guidance, we can do something

qml/Tutorial/TutorialBottom.qml+9−1

@@ -36,11 +36,19 @@ TutorialPage {

36 }

37

38 label {

39− text: i18n.tr("Swipe from the bottom edge")

39+ text: i18n.tr("Swipe from the bottom edge to manage the app")

40 anchors.bottom: arrow.top

41 anchors.bottomMargin: units.gu(3)

42 anchors.horizontalCenter: root.horizontalCenter

43 anchors.horizontalCenterOffset: (label.width - label.contentWidth) / 2

44 width: root.width - units.gu(8)

45 }

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+ }

46}

54}