git.iko.soy/unity8
on xenial help sign in
merge prereq
commit0478550ebdf275d1e3e5d7571f85913003c3869e authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 8 Sep 2016, 16:53 (10 years ago) parent3eac4745e01d48
3 files changed+3−6
compare with xenial
unifiedsplit
qml/Stages/DecoratedWindow.qml−1 qml/Stages/MoveHandler.qml+3−4 qml/Stages/WindowControlsOverlay.qml−1
qml/Stages/DecoratedWindow.qml−1
@@ -119,7 +119,6 @@ FocusScope {
119119
120120 MoveHandler {
121121 id: moveHandler
122− anchors.fill: parent
123122 objectName: "moveHandler"
124123 target: root.parent
125124 buttonsWidth: decoration.buttonsWidth
qml/Stages/MoveHandler.qml+3−4
@@ -21,7 +21,7 @@ import Utils 0.1
2121import "../Components"
2222import "../Components/PanelState"
2323
24−Item {
24+QtObject {
2525 id: root
2626
2727 property Item target // appDelegate
@@ -29,7 +29,7 @@ Item {
2929 property int stageHeight
3030 property real buttonsWidth: 0
3131
32− readonly property alias dragging: priv.dragging
32+ readonly property bool dragging: priv.dragging
3333
3434 signal fakeMaximizeAnimationRequested(real amount)
3535 signal fakeMaximizeLeftAnimationRequested(real amount)
@@ -40,8 +40,7 @@ Item {
4040 signal fakeMaximizeBottomRightAnimationRequested(real amount)
4141 signal stopFakeAnimation()
4242
43− QtObject {
44− id: priv
43+ property QtObject priv: QtObject {
4544 property real distanceX
4645 property real distanceY
4746 property bool dragging
qml/Stages/WindowControlsOverlay.qml−1
@@ -159,7 +159,6 @@ Item {
159159
160160 MoveHandler {
161161 id: moveHandler
162− anchors.fill: mouseArea
163162 objectName: "moveHandler"
164163 target: root.target
165164