git.iko.soy/unity8
on xenial help sign in
unbreak clash with resize area
5b1583fLukáš Tinkl
qml/Stages/DecoratedWindow.qml−4
compare with xenial
unifiedsplit
@@ -103,8 +103,4 @@ FocusScope {
103 interactive: true
103 interactive: true
104 focus: true
104 focus: true
105 }
105 }
106−
107− WindowControlsOverlay {
108− anchors.fill: root
109− }
110}
106}
qml/Stages/DesktopStage.qml+4
@@ -544,6 +544,10 @@ AbstractStage {
544 onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
544 onDecorationPressed: { ApplicationManager.focusApplication(model.appId) }
545 }
545 }
546
546
547+ WindowControlsOverlay {
548+ target: resizeArea
549+ }
550+
547 WindowedFullscreenPolicy {
551 WindowedFullscreenPolicy {
548 id: fullscreenPolicy
552 id: fullscreenPolicy
549 active: true
553 active: true
qml/Stages/WindowControlsOverlay.qml+5
@@ -19,6 +19,11 @@ import Ubuntu.Components 1.3
19import Ubuntu.Gestures 0.1
19import Ubuntu.Gestures 0.1
20
20
21Item {
21Item {
22+ // to be set from outside
23+ property Item target: null
24+
25+ anchors.fill: target
26+
22 TabletSideStageTouchGesture {
27 TabletSideStageTouchGesture {
23 minimumTouchPoints: 2
28 minimumTouchPoints: 2
24 maximumTouchPoints: 2
29 maximumTouchPoints: 2