Unity 8

qml/Components/PanelState/PanelState.qml (+2/-0)
qml/Panel/Panel.qml (+6/-0)
qml/Stages/DesktopStage.qml (+2/-0)
qml/Stages/WindowDecoration.qml (+2/-1)
qml/Stages/WindowResizeArea.qml (+7/-4)
tests/qmltests/Stages/tst_WindowResizeArea.qml (+43/-0)
tests/qmltests/tst_Shell.qml (+35/-4)

To merge this branch:

bzr merge lp:~mzanetti/unity8/fix-apps-under-panel

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)			Abstain on 2015-11-10
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-11-09
Lukáš Tinkl (community)		2015-10-30	Approve on 2015-11-02
Review via email: mp+276283@code.launchpad.net

Commit message

prevent windows to be moved under the panel

If they happen to have a saved state which is under the panel
(might happen on alt+drag later), they will be moved below the panel
on close and reopen. This is how unity7 behaves in this regard.

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.

see prereq

* Did you perform an exploratory manual test run of your code change and any related functionality?

yes

* Did you make sure that your branch does not contain spurious tags?

yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

* If you changed the UI, has there been a design review?

n/a

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-31:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6609/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2015-11-02:

The top panel interaction seems to work however, when I drag the window down (offscreen), it isn't restored correctly. Slightly unrelated but still worth fixing imo

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-11-02:

> The top panel interaction seems to work however, when I drag the window down
> (offscreen), it isn't restored correctly. Slightly unrelated but still worth
> fixing imo

fixed and added tests

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2015-11-02:

Yup, looking good, works, tests passing

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

Yes (except for broke xenial)

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-03:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6631/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-11-06:

Note: was already top approved

Text conflict in qml/Panel/Panel.qml
Text conflict in qml/Stages/DesktopStage.qml
Text conflict in qml/Stages/WindowResizeArea.qml
Text conflict in tests/qmltests/Stages/tst_DesktopStage.qml
Text conflict in tests/qmltests/Stages/tst_WindowResizeArea.qml
Text conflict in tests/qmltests/tst_Shell.qml
6 conflicts encountered.

I think some of these are from the parent branch and some own, so better to wait for the parent branch to be re-merged and then merge this one.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-06:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6658/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-11-09:

I still have the merge conflicts when merging this branch to unity8 trunk (and so does CI which fails to build).

Any idea why?

lp:~mzanetti/unity8/fix-apps-under-panel updated on 2015-11-09

2026. By Michael Zanetti on 2015-11-09: merge prereq
2027. By Michael Zanetti on 2015-11-09: fix bad merge

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-11-09:

> I still have the merge conflicts when merging this branch to unity8 trunk (and
> so does CI which fails to build).
>
> Any idea why?

Weird... there was some criss-cross merge which caused the prereq conflict with itself. Perhaps Lukas rewrote the history of his branch after I based mine on top of that. Anyhow, fixed now.

lp:~mzanetti/unity8/fix-apps-under-panel updated on 2015-11-09

2028. By Michael Zanetti on 2015-11-09: fix bad merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6682/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6688/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-11-10:

Merged and "CI" is happy again, re-top approving as per Lukáś old approve.

review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Zanetti

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Components/PanelState/PanelState.qml'
 --- qml/Components/PanelState/PanelState.qml	2015-07-15 15:07:19 +0000
 +++ qml/Components/PanelState/PanelState.qml	2015-11-09 10:53:06 +0000
@@ -23,6 +23,8 @@
      property string title: ""
      property bool buttonsVisible: false
++    property int panelHeight: 0
++
      signal close()
      signal minimize()
      signal maximize()
 === modified file 'qml/Panel/Panel.qml'
 --- qml/Panel/Panel.qml	2015-11-09 10:53:05 +0000
 +++ qml/Panel/Panel.qml	2015-11-09 10:53:06 +0000
@@ -32,6 +32,12 @@
      opacity: fullscreenMode && indicators.fullyClosed ? 0.0 : 1.0
++    Binding {
++        target: PanelState
++        property: "panelHeight"
++        value: root.panelHeight
++    }
++
      Rectangle {
          id: darkenedArea
          property real darkenedOpacity: 0.6
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2015-11-09 10:53:05 +0000
 +++ qml/Stages/DesktopStage.qml	2015-11-09 10:53:06 +0000
@@ -391,6 +391,8 @@
                      minHeight: units.gu(10)
                      borderThickness: units.gu(2)
                      windowId: model.appId // FIXME: Change this to point to windowId once we have such a thing
++                    screenWidth: root.width
++                    screenHeight: root.height
                      onPressed: { ApplicationManager.focusApplication(model.appId) }
+                 }
 === modified file 'qml/Stages/WindowDecoration.qml'
 --- qml/Stages/WindowDecoration.qml	2015-11-09 10:53:05 +0000
 +++ qml/Stages/WindowDecoration.qml	2015-11-09 10:53:06 +0000
@@ -18,6 +18,7 @@
  import Unity.Application 0.1 // For Mir singleton
  import Ubuntu.Components 1.3
  import "../Components"
++import "../Components/PanelState"
  MouseArea {
      id: root
@@ -56,7 +57,7 @@
              Mir.cursorName = "grabbing";
              var pos = mapToItem(root.target.parent, mouseX, mouseY);
              root.target.x = pos.x - priv.distanceX;
--            root.target.y = pos.y - priv.distanceY;
++            root.target.y = Math.max(pos.y - priv.distanceY, PanelState.panelHeight);
+         }
+     }
 === modified file 'qml/Stages/WindowResizeArea.qml'
 --- qml/Stages/WindowResizeArea.qml	2015-11-04 14:57:33 +0000
 +++ qml/Stages/WindowResizeArea.qml	2015-11-09 10:53:06 +0000
@@ -18,6 +18,7 @@
  import Ubuntu.Components 1.3
  import Utils 0.1
  import Unity.Application 0.1 // for Mir.cursorName
++import "../Components/PanelState"
  MouseArea {
      id: root
@@ -35,6 +36,8 @@
      property int borderThickness: 0
      property int minWidth: 0
      property int minHeight: 0
++    property int screenWidth: 0
++    property int screenHeight: 0
      QtObject {
          id: priv
@@ -66,10 +69,10 @@
      Component.onCompleted: {
          var windowGeometry = windowStateStorage.getGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
          if (windowGeometry !== undefined) {
--            target.x = windowGeometry.x
--            target.y = windowGeometry.y
--            target.width = windowGeometry.width
--            target.height = windowGeometry.height
++            target.width = Math.min(windowGeometry.width, root.screenWidth)
++            target.height = Math.min(windowGeometry.height, root.screenHeight - PanelState.panelHeight)
++            target.x = Math.max(Math.min(windowGeometry.x, root.screenWidth - target.width), 0)
++            target.y = Math.max(Math.min(windowGeometry.y, root.screenHeight - target.height), PanelState.panelHeight)
+         }
          var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
          if (windowState === WindowStateStorage.WindowStateMaximized) {
 === modified file 'tests/qmltests/Stages/tst_WindowResizeArea.qml'
 --- tests/qmltests/Stages/tst_WindowResizeArea.qml	2015-11-04 14:57:33 +0000
 +++ tests/qmltests/Stages/tst_WindowResizeArea.qml	2015-11-09 10:53:06 +0000
@@ -19,6 +19,7 @@
  import QtTest 1.0
  import Unity.Test 0.1
  import ".."
++import "../../../qml/Components/PanelState"
  import "../../../qml/Stages"
  import Ubuntu.Components 1.3
  import Ubuntu.Components.ListItems 1.3 as ListItem
@@ -31,6 +32,12 @@
      property var fakeWindow: windowLoader.item
++    Binding {
++        target: PanelState
++        property: "panelHeight"
++        value: units.gu(2)
++    }
++
      Component {
          id: fakeWindowComponent
@@ -57,6 +64,8 @@
                  minWidth: units.gu(15)
                  minHeight: units.gu(10)
                  windowId: "test-window-id"
++                screenWidth: root.width
++                screenHeight: root.height
+             }
              Rectangle {
@@ -228,5 +237,39 @@
              // clean up
              fakeWindow.state = "normal"
+         }
++
++
++        function test_restoreMovesIntoBounds_data() {
++            return [
++                        {tag: "left off", x: -units.gu(5), y: units.gu(5), w: units.gu(10), h: units.gu(10)},
++                        {tag: "top off", x: units.gu(5), y: -units.gu(5), w: units.gu(10), h: units.gu(10)},
++                        {tag: "right off", x: root.width - units.gu(5), y: units.gu(5), w: units.gu(10), h: units.gu(10)},
++                        {tag: "bottom off", x: units.gu(5), y: root.height - units.gu(5), w: units.gu(10), h: units.gu(10)},
++                        {tag: "width too large", x: units.gu(5), y: units.gu(5), w: root.width * 2, h: units.gu(10)},
++                        {tag: "height too large", x: units.gu(5), y: units.gu(5), w: units.gu(10), h: root.height * 2}
++                ]
++        }
++
++        function test_restoreMovesIntoBounds(data) {
++            fakeWindow.x = data.x;
++            fakeWindow.y = data.y;
++            fakeWindow.width = data.w;
++            fakeWindow.height = data.h;
++            waitForRendering(root);
++
++            // This will destroy the window and recreate it
++            windowLoader.active = false;
++            waitForRendering(root);
++            windowLoader.active = true;
++            waitForRendering(root)
++
++            // Make sure it's again where we left it in normal state before destroying
++            compare(fakeWindow.x >= 0, true)
++            compare(fakeWindow.y >= PanelState.panelHeight, true)
++            compare(fakeWindow.x + fakeWindow.width <= root.width, true)
++            compare(fakeWindow.y + fakeWindow.height <= root.height, true)
++
++            waitForRendering(root)
++        }
+     }
+ }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-11-04 14:58:05 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-11-09 10:53:06 +0000
@@ -344,9 +344,9 @@
              var app2 = ApplicationManager.startApplication("webbrowser-app")
              var app3 = ApplicationManager.startApplication("camera-app")
              var app4 = ApplicationManager.startApplication("facebook-webapp")
--            var app5 = ApplicationManager.startApplication("calendar-app")
++            var app5 = ApplicationManager.startApplication("camera-app")
              var app6 = ApplicationManager.startApplication("gallery-app")
--            var app7 = ApplicationManager.startApplication("camera-app")
++            var app7 = ApplicationManager.startApplication("calendar-app")
              waitUntilAppWindowIsFullyLoaded(app7);
+         }
@@ -1710,11 +1710,11 @@
              keyPress(Qt.Key_Control)
              keyClick(Qt.Key_Tab);
--
              tryCompare(desktopSpread, "state", "altTab")
--            mouseMove(shell, 0, 0);
++            mouseMove(shell, 0, shell.height / 2);
              tryCompare(launcher, "state", "visibleTemporary")
++            waitForRendering(shell)
              mouseClick(bfb, bfb.width / 2, bfb.height / 2)
              tryCompare(launcher, "state", "")
@@ -1809,6 +1809,37 @@
              tryCompare(panelButtons, "visible", true);
+         }
++        function test_cantMoveWindowUnderPanel() {
++            loadDesktopShellWithApps();
++            var appRepeater = findChild(shell, "appRepeater")
++            var appDelegate = appRepeater.itemAt(0);
++
++            mousePress(appDelegate, appDelegate.width / 2, units.gu(1))
++            mouseMove(appDelegate, appDelegate.width / 2, -units.gu(100))
++
++            compare(appDelegate.y >= PanelState.panelHeight, true);
++        }
++
++        function test_restoreWindowStateFixesIfUnderPanel() {
++            loadDesktopShellWithApps();
++            var appRepeater = findChild(shell, "appRepeater")
++            var appId = ApplicationManager.get(0).appId;
++            var appDelegate = appRepeater.itemAt(0);
++
++            // Move it under the panel programmatically (might happen later with an alt+drag)
++            appDelegate.y = -units.gu(10)
++
++            ApplicationManager.stopApplication(appId)
++            ApplicationManager.startApplication(appId)
++            waitForRendering(shell)
++
++            // Make sure the newly started one is at index 0 again
++            tryCompare(ApplicationManager.get(0), "appId", appId);
++
++            appDelegate = appRepeater.itemAt(0);
++            compare(appDelegate.y >= PanelState.panelHeight, true);
++        }
++
          function test_lifecyclePolicyForNonTouchApp_data() {
              return [
                  {tag: "phone", formFactor: "phone", usageScenario: "phone"},