git.iko.soy/unity8
on xenial help sign in
properly hide/show the central piece and resize grips
192470dLukáš Tinkl
qml/Stages/WindowControlsOverlay.qml+11−9
compare with xenial
unifiedsplit
@@ -93,10 +93,12 @@ Item {
93 Item {
93 Item {
94 id: overlay
94 id: overlay
95 anchors.fill: parent
95 anchors.fill: parent
96− opacity: overlayTimer.running && target && !target.maximized && !target.fullscreen ? 1 : 0
96+ opacity: overlayTimer.running && target && !target.fullscreen ? 1 : 0
97 visible: opacity == 1
97 visible: opacity == 1
98 enabled: visible
98 enabled: visible
99
99
100+ readonly property bool anyMaximized: target && (target.maximized || target.maximizedLeft || target.maximizedRight)
101+
100 Behavior on opacity {
102 Behavior on opacity {
101 OpacityAnimator { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }
103 OpacityAnimator { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }
102 }
104 }
@@ -114,7 +116,7 @@ Item {
114 anchors.horizontalCenterOffset: borderThickness
116 anchors.horizontalCenterOffset: borderThickness
115 anchors.verticalCenter: parent.top
117 anchors.verticalCenter: parent.top
116 anchors.verticalCenterOffset: borderThickness
118 anchors.verticalCenterOffset: borderThickness
117− visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
119+ visible: !overlay.anyMaximized
118 resizeTarget: root.resizeTarget
120 resizeTarget: root.resizeTarget
119 }
121 }
120
122
@@ -123,7 +125,7 @@ Item {
123 anchors.verticalCenter: parent.top
125 anchors.verticalCenter: parent.top
124 anchors.verticalCenterOffset: borderThickness
126 anchors.verticalCenterOffset: borderThickness
125 rotation: 45
127 rotation: 45
126− visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
128+ visible: !overlay.anyMaximized
127 resizeTarget: root.resizeTarget
129 resizeTarget: root.resizeTarget
128 }
130 }
129
131
@@ -133,7 +135,7 @@ Item {
133 anchors.verticalCenter: parent.top
135 anchors.verticalCenter: parent.top
134 anchors.verticalCenterOffset: borderThickness
136 anchors.verticalCenterOffset: borderThickness
135 rotation: 90
137 rotation: 90
136− visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
138+ visible: !overlay.anyMaximized
137 resizeTarget: root.resizeTarget
139 resizeTarget: root.resizeTarget
138 }
140 }
139
141
@@ -142,7 +144,7 @@ Item {
142 anchors.horizontalCenterOffset: -borderThickness
144 anchors.horizontalCenterOffset: -borderThickness
143 anchors.verticalCenter: parent.verticalCenter
145 anchors.verticalCenter: parent.verticalCenter
144 rotation: 135
146 rotation: 135
145− visible: resizeTarget && !resizeTarget.maximizedRight
147+ visible: target && !target.maximizedRight && !target.maximized
146 resizeTarget: root.resizeTarget
148 resizeTarget: root.resizeTarget
147 }
149 }
148
150
@@ -151,7 +153,7 @@ Item {
151 anchors.horizontalCenterOffset: -borderThickness
153 anchors.horizontalCenterOffset: -borderThickness
152 anchors.verticalCenter: parent.bottom
154 anchors.verticalCenter: parent.bottom
153 anchors.verticalCenterOffset: -borderThickness
155 anchors.verticalCenterOffset: -borderThickness
154− visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
156+ visible: !overlay.anyMaximized
155 resizeTarget: root.resizeTarget
157 resizeTarget: root.resizeTarget
156 }
158 }
157
159
@@ -160,7 +162,7 @@ Item {
160 anchors.verticalCenter: parent.bottom
162 anchors.verticalCenter: parent.bottom
161 anchors.verticalCenterOffset: -borderThickness
163 anchors.verticalCenterOffset: -borderThickness
162 rotation: 45
164 rotation: 45
163− visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
165+ visible: !overlay.anyMaximized
164 resizeTarget: root.resizeTarget
166 resizeTarget: root.resizeTarget
165 }
167 }
166
168
@@ -170,7 +172,7 @@ Item {
170 anchors.verticalCenter: parent.bottom
172 anchors.verticalCenter: parent.bottom
171 anchors.verticalCenterOffset: -borderThickness
173 anchors.verticalCenterOffset: -borderThickness
172 rotation: 90
174 rotation: 90
173− visible: resizeTarget && !resizeTarget.maximizedLeft && !resizeTarget.maximizedRight
175+ visible: !overlay.anyMaximized
174 resizeTarget: root.resizeTarget
176 resizeTarget: root.resizeTarget
175 }
177 }
176
178
@@ -179,7 +181,7 @@ Item {
179 anchors.horizontalCenterOffset: borderThickness
181 anchors.horizontalCenterOffset: borderThickness
180 anchors.verticalCenter: parent.verticalCenter
182 anchors.verticalCenter: parent.verticalCenter
181 rotation: 135
183 rotation: 135
182− visible: resizeTarget && !resizeTarget.maximizedLeft
184+ visible: target && !target.maximizedLeft && !target.maximized
183 resizeTarget: root.resizeTarget
185 resizeTarget: root.resizeTarget
184 }
186 }
185 }
187 }