git.iko.soy/unity8
on xenial help sign in
take the horizontal/vertical maximization into account as well
e8ed54eLukáš Tinkl
qml/Stages/WindowControlsOverlay.qml+9−9
compare with xenial
unifiedsplit
@@ -34,7 +34,7 @@ Item {
34 anchors.fill: parent
34 anchors.fill: parent
35
35
36 // NB: for testing set to 2, not to clash with unity7 touch overlay controls
36 // NB: for testing set to 2, not to clash with unity7 touch overlay controls
37− minimumTouchPoints: 2
37+ minimumTouchPoints: 3
38 maximumTouchPoints: minimumTouchPoints
38 maximumTouchPoints: minimumTouchPoints
39 releaseRejectPeriod: 500
39 releaseRejectPeriod: 500
40
40
@@ -152,7 +152,7 @@ Item {
152 ResizeGrip { // top left
152 ResizeGrip { // top left
153 anchors.horizontalCenter: parent.left
153 anchors.horizontalCenter: parent.left
154 anchors.verticalCenter: parent.top
154 anchors.verticalCenter: parent.top
155− visible: target && !overlay.anyMaximized
155+ visible: target && !overlay.anyMaximized && !target.maximizedHorizontally && !target.maximizedVertically
156 resizeTarget: priv.resizeArea
156 resizeTarget: priv.resizeArea
157 }
157 }
158
158
@@ -160,7 +160,7 @@ Item {
160 anchors.horizontalCenter: parent.horizontalCenter
160 anchors.horizontalCenter: parent.horizontalCenter
161 anchors.verticalCenter: parent.top
161 anchors.verticalCenter: parent.top
162 rotation: 45
162 rotation: 45
163− visible: target && !overlay.anyMaximized
163+ visible: target && !overlay.anyMaximized && !target.maximizedVertically
164 resizeTarget: priv.resizeArea
164 resizeTarget: priv.resizeArea
165 }
165 }
166
166
@@ -168,7 +168,7 @@ Item {
168 anchors.horizontalCenter: parent.right
168 anchors.horizontalCenter: parent.right
169 anchors.verticalCenter: parent.top
169 anchors.verticalCenter: parent.top
170 rotation: 90
170 rotation: 90
171− visible: target && !overlay.anyMaximized
171+ visible: target && !overlay.anyMaximized && !target.maximizedHorizontally && !target.maximizedVertically
172 resizeTarget: priv.resizeArea
172 resizeTarget: priv.resizeArea
173 }
173 }
174
174
@@ -176,14 +176,14 @@ Item {
176 anchors.horizontalCenter: parent.right
176 anchors.horizontalCenter: parent.right
177 anchors.verticalCenter: parent.verticalCenter
177 anchors.verticalCenter: parent.verticalCenter
178 rotation: 135
178 rotation: 135
179− visible: target && !target.maximizedRight && !target.maximized
179+ visible: target && !target.maximizedRight && !target.maximized && !target.maximizedHorizontally
180 resizeTarget: priv.resizeArea
180 resizeTarget: priv.resizeArea
181 }
181 }
182
182
183 ResizeGrip { // bottom right
183 ResizeGrip { // bottom right
184 anchors.horizontalCenter: parent.right
184 anchors.horizontalCenter: parent.right
185 anchors.verticalCenter: parent.bottom
185 anchors.verticalCenter: parent.bottom
186− visible: target && !overlay.anyMaximized
186+ visible: target && !overlay.anyMaximized && !target.maximizedHorizontally && !target.maximizedVertically
187 resizeTarget: priv.resizeArea
187 resizeTarget: priv.resizeArea
188 }
188 }
189
189
@@ -191,7 +191,7 @@ Item {
191 anchors.horizontalCenter: parent.horizontalCenter
191 anchors.horizontalCenter: parent.horizontalCenter
192 anchors.verticalCenter: parent.bottom
192 anchors.verticalCenter: parent.bottom
193 rotation: 45
193 rotation: 45
194− visible: target && !overlay.anyMaximized
194+ visible: target && !overlay.anyMaximized && !target.maximizedVertically
195 resizeTarget: priv.resizeArea
195 resizeTarget: priv.resizeArea
196 }
196 }
197
197
@@ -199,7 +199,7 @@ Item {
199 anchors.horizontalCenter: parent.left
199 anchors.horizontalCenter: parent.left
200 anchors.verticalCenter: parent.bottom
200 anchors.verticalCenter: parent.bottom
201 rotation: 90
201 rotation: 90
202− visible: target && !overlay.anyMaximized
202+ visible: target && !overlay.anyMaximized && !target.maximizedHorizontally && !target.maximizedVertically
203 resizeTarget: priv.resizeArea
203 resizeTarget: priv.resizeArea
204 }
204 }
205
205
@@ -207,7 +207,7 @@ Item {
207 anchors.horizontalCenter: parent.left
207 anchors.horizontalCenter: parent.left
208 anchors.verticalCenter: parent.verticalCenter
208 anchors.verticalCenter: parent.verticalCenter
209 rotation: 135
209 rotation: 135
210− visible: target && !target.maximizedLeft && !target.maximized
210+ visible: target && !target.maximizedLeft && !target.maximized && !target.maximizedHorizontally
211 resizeTarget: priv.resizeArea
211 resizeTarget: priv.resizeArea
212 }
212 }
213 }
213 }