on xenial help sign in
don't export the moveHandler from DesktopStage delegate, not needed
5e6ca45Lukáš Tinkl
qml/Shell.qml+2−1
@@ -779,7 +779,8 @@ StyledItem {
779 height: units.gu(3)
779 height: units.gu(3)
780
780
781 readonly property var previewRectangle: applicationsDisplayLoader.item && applicationsDisplayLoader.item.previewRectangle &&
781 readonly property var previewRectangle: applicationsDisplayLoader.item && applicationsDisplayLoader.item.previewRectangle &&
782− applicationsDisplayLoader.item.previewRectangle.targetDragging ?
782+ applicationsDisplayLoader.item.previewRectangle.target &&
783+ applicationsDisplayLoader.item.previewRectangle.target.dragging ?
783 applicationsDisplayLoader.item.previewRectangle : null
784 applicationsDisplayLoader.item.previewRectangle : null
784
785
785 onPushedLeftBoundary: {
786 onPushedLeftBoundary: {
qml/Stages/DesktopStage.qml+1−1
@@ -347,7 +347,7 @@ AbstractStage {
347 readonly property var surface: model.surface
347 readonly property var surface: model.surface
348 readonly property alias resizeArea: resizeArea
348 readonly property alias resizeArea: resizeArea
349 readonly property alias focusedSurface: decoratedWindow.focusedSurface
349 readonly property alias focusedSurface: decoratedWindow.focusedSurface
350− readonly property var moveHandler: touchControls.overlayShown ? touchControls.moveHandler : decoratedWindow.moveHandler
350+ readonly property bool dragging: touchControls.overlayShown ? touchControls.moveHandler.dragging : decoratedWindow.moveHandler.dragging
351
351
352 readonly property bool isDash: model.application.appId == "unity8-dash"
352 readonly property bool isDash: model.application.appId == "unity8-dash"
353
353
qml/Stages/FakeMaximizeDelegate.qml−1
@@ -37,7 +37,6 @@ Rectangle {
37 property real appContainerHeight
37 property real appContainerHeight
38
38
39 readonly property real hintThreshold: 0.1
39 readonly property real hintThreshold: 0.1
40− readonly property bool targetDragging: target && target.moveHandler.dragging
41
40
42 // Edge push progress
41 // Edge push progress
43 // Value range is [0.0, 1.0]
42 // Value range is [0.0, 1.0]