28bb748 · unity8 · git.iko.soy

plugins/Ubuntu/Gestures/DirectionalDragArea.cpp−3

compare with xenial

unifiedsplit

@@ -884,6 +884,3 @@ qreal DirectionalDragArea::projectOntoDirectionVector(const QPointF &sceneVector

884 return sceneVector.x() * m_sceneDirectionVector.x() +

885 sceneVector.y() * m_sceneDirectionVector.y();

886}

887−

888−// Because we are defining a new QObject-based class (RecognitionTimer) here.

889−#include "DirectionalDragArea.moc"

qml/Greeter/Greeter.qml+7

@@ -26,6 +26,7 @@ Showable {

26 created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready

27

28 property real dragHandleLeftMargin: 0

29+ property alias dragging: dragHandle.dragging

29

30

30 property url background

31 property url background

31

32

@@ -114,6 +115,12 @@ Showable {

114 greeter.tapped();

115 greeter.tapped();

115 showLabelAnimation.start();

116 showLabelAnimation.start();

116 }

117 }

118+

119+ onDraggingChanged: {

120+ if (dragging) {

121+ showLabelAnimation.start();

122+ }

123+ }

117 }

124 }

118

125

119 Label {

126 Label {

qml/Shell.qml+5

@@ -613,6 +613,11 @@ Item {

613 }

614

615 onTapped: launcher.tease()

616+ onDraggingChanged: {

617+ if (dragging) {

618+ launcher.tease();

619+ }

620+ }

616

621

617 Binding {

622 Binding {

618 target: ApplicationManager

623 target: ApplicationManager