on xenial help sign in
fix bad merge
commit5f6605839a3e1f9f826e2a6b76d28872cb18ec8d authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 9 Nov 2015, 11:52 (11 years ago) parent1a85ae9
1 file changed+4−4
qml/Stages/WindowResizeArea.qml+4−4
qml/Stages/WindowResizeArea.qml+4−4
@@ -69,10 +69,10 @@ MouseArea {
6969 Component.onCompleted: {
7070 var windowGeometry = windowStateStorage.getGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
7171 if (windowGeometry !== undefined) {
72− target.x = windowGeometry.x
73− target.y = windowGeometry.y
74− target.width = windowGeometry.width
75− target.height = windowGeometry.height
72+ target.width = Math.min(windowGeometry.width, root.screenWidth)
73+ target.height = Math.min(windowGeometry.height, root.screenHeight - PanelState.panelHeight)
74+ target.x = Math.max(Math.min(windowGeometry.x, root.screenWidth - target.width), 0)
75+ target.y = Math.max(Math.min(windowGeometry.y, root.screenHeight - target.height), PanelState.panelHeight)
7676 }
7777 var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
7878 if (windowState === WindowStateStorage.WindowStateMaximized) {