git.iko.soy/unity8
on xenial help sign in
Some more s/SurfaceManager/ApplicationManager clean up
086ccceDaniel d'Andrada
qml/Shell.qml+8−8
compare with xenial
unifiedsplit
@@ -156,7 +156,7 @@ FocusScope {
156
156
157 onTouchXChanged: {
157 onTouchXChanged: {
158 if (status == DirectionalDragArea.Recognized) {
158 if (status == DirectionalDragArea.Recognized) {
159− if (SurfaceManager.empty) {
159+ if (ApplicationManager.empty) {
160 progress = Math.max(stages.width - stagesDragArea.width + touchX, stages.width * .3);
160 progress = Math.max(stages.width - stagesDragArea.width + touchX, stages.width * .3);
161 } else {
161 } else {
162 progress = stages.width - stagesDragArea.width + touchX;
162 progress = stages.width - stagesDragArea.width + touchX;
@@ -166,7 +166,7 @@ FocusScope {
166
166
167 onDraggingChanged: {
167 onDraggingChanged: {
168 if (!dragging) {
168 if (!dragging) {
169− if (!SurfaceManager.empty && progress < stages.width - units.gu(10)) {
169+ if (!ApplicationManager.empty && progress < stages.width - units.gu(10)) {
170 stages.show();
170 stages.show();
171 }
171 }
172 stagesDragArea.progress = Qt.binding(function () { return stages.width; });
172 stagesDragArea.progress = Qt.binding(function () { return stages.width; });
@@ -189,8 +189,8 @@ FocusScope {
189 property bool shown: false
189 property bool shown: false
190 onShownChanged: {
190 onShownChanged: {
191 if (shown) {
191 if (shown) {
192− if (SurfaceManager.topmostSurface) {
192+ if (ApplicationManager.topmostApplication) {
193− ApplicationManager.focusApplication(SurfaceManager.topmostSurface.application.appId);
193+ ApplicationManager.focusApplication(ApplicationManager.topmostApplication.appId);
194 }
194 }
195 } else {
195 } else {
196 if (ApplicationManager.focusedApplicationId) {
196 if (ApplicationManager.focusedApplicationId) {
@@ -440,11 +440,11 @@ FocusScope {
440 contentEnabled: edgeDemo.panelContentEnabled
440 contentEnabled: edgeDemo.panelContentEnabled
441 }
441 }
442
442
443− property bool topmostSurfaceIsFullscreen:
443+ property bool topmostApplicationIsFullscreen:
444− SurfaceManager.topmostSurface &&
444+ ApplicationManager.topmostApplication &&
445− SurfaceManager.topmostSurface.state === MirSurfaceItem.Fullscreen
445+ ApplicationManager.topmostApplication.fullscreen
446
446
447− fullscreenMode: stages.roughlyFullyShown && topmostSurfaceIsFullscreen
447+ fullscreenMode: stages.roughlyFullyShown && topmostApplicationIsFullscreen
448 && !greeter.shown && !lockscreen.shown
448 && !greeter.shown && !lockscreen.shown
449
449
450 searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable
450 searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable