on xenial help sign in
properly hide/show the central piece and resize grips

based on individual max states

commit192470dec8514e8183224abcd1f20627ac76c39a authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 30 Mar 2016, 17:51 (11 years ago) parent78736b8
1 file changed+11−9
qml/Stages/WindowControlsOverlay.qml+11−9
qml/Stages/WindowControlsOverlay.qml+11−9
@@ -93,10 +93,12 @@ Item {
9393 Item {
9494 id: overlay
9595 anchors.fill: parent
96− opacity: overlayTimer.running && target && !target.maximized && !target.fullscreen ? 1 : 0
96+ opacity: overlayTimer.running && target && !target.fullscreen ? 1 : 0
9797 visible: opacity == 1
9898 enabled: visible
9999
100+ readonly property bool anyMaximized: target && (target.maximized || target.maximizedLeft || target.maximizedRight)
101+
100102 Behavior on opacity {
101103 OpacityAnimator { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }
102104 }
@@ -114,7 +116,7 @@ Item {
114116 anchors.horizontalCenterOffset: borderThickness
115117 anchors.verticalCenter: parent.top
116118 anchors.verticalCenterOffset: borderThickness
117− visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
119+ visible: !overlay.anyMaximized
118120 resizeTarget: root.resizeTarget
119121 }
120122
@@ -123,7 +125,7 @@ Item {
123125 anchors.verticalCenter: parent.top
124126 anchors.verticalCenterOffset: borderThickness
125127 rotation: 45
126− visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
128+ visible: !overlay.anyMaximized
127129 resizeTarget: root.resizeTarget
128130 }
129131
@@ -133,7 +135,7 @@ Item {
133135 anchors.verticalCenter: parent.top
134136 anchors.verticalCenterOffset: borderThickness
135137 rotation: 90
136− visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
138+ visible: !overlay.anyMaximized
137139 resizeTarget: root.resizeTarget
138140 }
139141
@@ -142,7 +144,7 @@ Item {
142144 anchors.horizontalCenterOffset: -borderThickness
143145 anchors.verticalCenter: parent.verticalCenter
144146 rotation: 135
145− visible: resizeTarget && !resizeTarget.maximizedRight
147+ visible: target && !target.maximizedRight && !target.maximized
146148 resizeTarget: root.resizeTarget
147149 }
148150
@@ -151,7 +153,7 @@ Item {
151153 anchors.horizontalCenterOffset: -borderThickness
152154 anchors.verticalCenter: parent.bottom
153155 anchors.verticalCenterOffset: -borderThickness
154− visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
156+ visible: !overlay.anyMaximized
155157 resizeTarget: root.resizeTarget
156158 }
157159
@@ -160,7 +162,7 @@ Item {
160162 anchors.verticalCenter: parent.bottom
161163 anchors.verticalCenterOffset: -borderThickness
162164 rotation: 45
163− visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
165+ visible: !overlay.anyMaximized
164166 resizeTarget: root.resizeTarget
165167 }
166168
@@ -170,7 +172,7 @@ Item {
170172 anchors.verticalCenter: parent.bottom
171173 anchors.verticalCenterOffset: -borderThickness
172174 rotation: 90
173− visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
175+ visible: !overlay.anyMaximized
174176 resizeTarget: root.resizeTarget
175177 }
176178
@@ -179,7 +181,7 @@ Item {
179181 anchors.horizontalCenterOffset: borderThickness
180182 anchors.verticalCenter: parent.verticalCenter
181183 rotation: 135
182− visible: resizeTarget && !resizeTarget.maximizedLeft
184+ visible: target && !target.maximizedLeft && !target.maximized
183185 resizeTarget: root.resizeTarget
184186 }
185187 }