8516e87 · unity8 · git.iko.soy

git.iko.soy/unity8

fix for fullscreen apps in desktop mode

commit8516e87678ce10ba1407ada65d44c7991c99392e authorLukáš Tinkl <lukas.tinkl@canonical.com> dateMon 29 Feb 2016, 13:58 (11 years ago) parent73f7131

2 files changed+3−1

compare with xenial

unifiedsplit

qml/Stages/DesktopStage.qml+1 qml/Stages/WindowResizeArea.qml+2−1

qml/Stages/DesktopStage.qml+1

@@ -275,6 +275,7 @@ AbstractStage {

275275 readonly property alias maximizedLeft: appDelegatePrivate.maximizedLeft

276276 readonly property alias maximizedRight: appDelegatePrivate.maximizedRight

277277 readonly property alias minimized: appDelegatePrivate.minimized

278+ readonly property alias fullscreen: decoratedWindow.fullscreen

278279

279280 readonly property string appId: model.appId

280281 property bool animationsEnabled: true

qml/Stages/WindowResizeArea.qml+2−1

@@ -75,7 +75,8 @@ MouseArea {

7575

7676 target.requestedWidth = Qt.binding(function() { return Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin); });

7777 target.requestedHeight = Qt.binding(function() { return Math.min(Math.max(windowGeometry.height, d.minimumHeight), root.screenHeight - PanelState.panelHeight); });

78− target.x = Qt.binding(function() { return Math.max(Math.min(windowGeometry.x, root.screenWidth - root.leftMargin - target.requestedWidth), root.leftMargin); });

78+ target.x = Qt.binding(function() { return Math.max(Math.min(windowGeometry.x, root.screenWidth - root.leftMargin - target.requestedWidth),

79+ (target.fullscreen ? 0 : root.leftMargin)); });

7980 target.y = Qt.binding(function() { return Math.max(Math.min(windowGeometry.y, root.screenHeight - target.requestedHeight), PanelState.panelHeight); });

8081

8182 var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)