git.iko.soy/unity8
on xenial help sign in
implement resizing \o/
commitdce2835a9f1ef06df57fa221cfd050d1bc51e8bd authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 30 Mar 2016, 17:01 (11 years ago) parent45fe6d5
4 files changed+34−12
compare with xenial
unifiedsplit
qml/Stages/DesktopStage.qml+1 qml/Stages/ResizeGrip.qml+11 qml/Stages/WindowControlsOverlay.qml+20−11 qml/Stages/WindowResizeArea.qml+2−1
qml/Stages/DesktopStage.qml+1
@@ -547,6 +547,7 @@ AbstractStage {
547547 WindowControlsOverlay {
548548 anchors.fill: resizeArea
549549 target: appDelegate
550+ resizeTarget: resizeArea
550551 borderThickness: resizeArea.borderThickness
551552 }
552553
qml/Stages/ResizeGrip.qml+11
@@ -23,10 +23,21 @@ Rectangle {
2323 radius: height / 2
2424 color: theme.palette.normal.background
2525
26+ // to be set from outside
27+ property Item resizeTarget
28+
2629 Image {
2730 source: "graphics/arrows.png"
2831 anchors.centerIn: parent
2932 width: units.gu(2)
3033 height: width
3134 }
35+
36+ MouseArea {
37+ anchors.fill: parent
38+ hoverEnabled: true
39+
40+ Mouse.enabled: resizeTarget
41+ Mouse.forwardTo: resizeTarget
42+ }
3243}
qml/Stages/WindowControlsOverlay.qml+20−11
@@ -23,6 +23,7 @@ Item {
2323 id: root
2424 // to be set from outside
2525 property Item target // appDelegate
26+ property Item resizeTarget // WindowResizeArea
2627 property int borderThickness
2728
2829 TabletSideStageTouchGesture {
@@ -47,6 +48,7 @@ Item {
4748 Timer { // dismiss timer
4849 id: overlayTimer
4950 interval: 2000
51+ repeat: priv.dragging || root.resizeTarget.dragging
5052 }
5153
5254 InverseMouseArea { // dismiss area
@@ -62,7 +64,7 @@ Item {
6264 }
6365
6466 MouseArea {
65− anchors.fill: parent
67+ anchors.fill: overlay
6668 visible: overlay.visible
6769 enabled: visible
6870
@@ -89,8 +91,7 @@ Item {
8991 Item {
9092 id: overlay
9193 anchors.fill: parent
92− visible: (overlayTimer.running || priv.dragging) &&
93− target && !target.maximized && !target.fullscreen
94+ visible: overlayTimer.running && target && !target.maximized && !target.fullscreen
9495 enabled: visible
9596
9697 Image {
@@ -105,7 +106,8 @@ Item {
105106 anchors.horizontalCenterOffset: borderThickness
106107 anchors.verticalCenter: parent.top
107108 anchors.verticalCenterOffset: borderThickness
108− visible: target && !target.maximizedLeft && !target.maximizedRight
109+ visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
110+ resizeTarget: root.resizeTarget
109111 }
110112
111113 ResizeGrip { // top center
@@ -113,7 +115,8 @@ Item {
113115 anchors.verticalCenter: parent.top
114116 anchors.verticalCenterOffset: borderThickness
115117 rotation: 45
116− visible: target && !target.maximizedLeft && !target.maximizedRight
118+ visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
119+ resizeTarget: root.resizeTarget
117120 }
118121
119122 ResizeGrip { // top right
@@ -122,7 +125,8 @@ Item {
122125 anchors.verticalCenter: parent.top
123126 anchors.verticalCenterOffset: borderThickness
124127 rotation: 90
125− visible: target && !target.maximizedLeft && !target.maximizedRight
128+ visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
129+ resizeTarget: root.resizeTarget
126130 }
127131
128132 ResizeGrip { // right
@@ -130,7 +134,8 @@ Item {
130134 anchors.horizontalCenterOffset: -borderThickness
131135 anchors.verticalCenter: parent.verticalCenter
132136 rotation: 135
133− visible: target && !target.maximizedRight
137+ visible: resizeTarget && !resizeTarget.maximizedRight
138+ resizeTarget: root.resizeTarget
134139 }
135140
136141 ResizeGrip { // bottom right
@@ -138,7 +143,8 @@ Item {
138143 anchors.horizontalCenterOffset: -borderThickness
139144 anchors.verticalCenter: parent.bottom
140145 anchors.verticalCenterOffset: -borderThickness
141− visible: target && !target.maximizedLeft && !target.maximizedRight
146+ visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
147+ resizeTarget: root.resizeTarget
142148 }
143149
144150 ResizeGrip { // bottom center
@@ -146,7 +152,8 @@ Item {
146152 anchors.verticalCenter: parent.bottom
147153 anchors.verticalCenterOffset: -borderThickness
148154 rotation: 45
149− visible: target && !target.maximizedLeft && !target.maximizedRight
155+ visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
156+ resizeTarget: root.resizeTarget
150157 }
151158
152159 ResizeGrip { // bottom left
@@ -155,7 +162,8 @@ Item {
155162 anchors.verticalCenter: parent.bottom
156163 anchors.verticalCenterOffset: -borderThickness
157164 rotation: 90
158− visible: target && !target.maximizedLeft && !target.maximizedRight
165+ visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
166+ resizeTarget: root.resizeTarget
159167 }
160168
161169 ResizeGrip { // left
@@ -163,7 +171,8 @@ Item {
163171 anchors.horizontalCenterOffset: borderThickness
164172 anchors.verticalCenter: parent.verticalCenter
165173 rotation: 135
166− visible: target && !target.maximizedLeft
174+ visible: resizeTarget && !resizeTarget.maximizedLeft
175+ resizeTarget: root.resizeTarget
167176 }
168177 }
169178}
qml/Stages/WindowResizeArea.qml+2−1
@@ -28,6 +28,7 @@ MouseArea {
2828 hoverEnabled: target && !target.maximized // don't grab the resize under the panel
2929
3030 property var windowStateStorage: WindowStateStorage
31+ readonly property alias dragging: d.dragging
3132
3233 // The target item managed by this. Must be a parent or a sibling
3334 // The area will anchor to it and manage move and resize events
@@ -180,7 +181,7 @@ MouseArea {
180181 property real currentWidth
181182 property real currentHeight
182183
183− property string cursorName: {
184+ readonly property string cursorName: {
184185 if (root.containsMouse || root.pressed) {
185186 if (leftBorder && !topBorder && !bottomBorder) {
186187 return "left_side";