Unity 8

qml/Stages/PhoneStage.qml (+47/-6)
qml/Stages/SpreadDelegate.qml (+20/-0)
qml/Stages/TabletStage.qml (+53/-6)
tests/qmltests/Stages/tst_SpreadDelegate.qml (+7/-0)
tests/qmltests/tst_Shell.qml (+12/-12)

To merge this branch:

bzr merge lp:~mzanetti/unity8/staged-spread-with-kbd

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2016-03-07	Approve on 2016-03-10
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-03-07
Review via email: mp+288281@code.launchpad.net

Commit message

Allow alt+tabbing in staged mode too

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?

vesa is testing it

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-03-07:

A checkbox in tst_SpreadDelegate.qml to control highlightShown would be nice.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-07:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/610/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-07:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/616/rebuild

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/staged-spread-with-kbd updated on 2016-03-10

2208. By Michael Zanetti on 2016-03-10: merge trunk
2209. By Michael Zanetti on 2016-03-10: allow navigating the staged spreads with keyboard too
2210. By Michael Zanetti on 2016-03-10: merge prereq

Revision history for this message

Albert Astals Cid (aacid) wrote on 2016-03-10:

* 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

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

review: Approve

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/Stages/PhoneStage.qml'
 --- qml/Stages/PhoneStage.qml	2016-03-10 12:03:17 +0000
 +++ qml/Stages/PhoneStage.qml	2016-03-10 12:03:17 +0000
@@ -44,6 +44,33 @@
+         }
+     }
++    onAltTabPressedChanged: {
++        if (!spreadEnabled || !altTabEnabled) {
++            return;
++        }
++        if (altTabPressed) {
++            spreadView.snapToSpread();
++            priv.highlightIndex = Math.min(spreadRepeater.count - 1, 1);
++        } else {
++            spreadView.snapTo(priv.highlightIndex)
++        }
++    }
++
++    FocusScope {
++        focus: root.altTabPressed
++
++        Keys.onPressed: {
++            switch (event.key) {
++            case Qt.Key_Tab:
++                priv.highlightIndex = (priv.highlightIndex + 1) % spreadRepeater.count
++                break;
++            case Qt.Key_Backtab:
++                priv.highlightIndex = (priv.highlightIndex + spreadRepeater.count - 1) % spreadRepeater.count
++                break;
++            }
++        }
++    }
++
      // Functions to be called from outside
      function updateFocusedAppOrientation() {
          if (spreadRepeater.count > 0) {
@@ -186,6 +213,7 @@
          property real oldInverseProgress: 0
          property bool animateX: false
++        property int highlightIndex: 0
          onFocusedAppDelegateChanged: {
              if (focusedAppDelegate) {
@@ -220,6 +248,10 @@
              spreadView.phase = 0;
              spreadView.contentX = -spreadView.shift;
+         }
++
++        onHighlightIndexChanged: {
++            spreadView.contentX = highlightIndex * spreadView.contentWidth / (spreadRepeater.count + 2)
++        }
+     }
      Timer {
          id: fullyShowingFocusedAppUpdateTimer
@@ -287,6 +319,11 @@
+             }
+         }
++        Behavior on contentX {
++            enabled: root.altTabPressed
++            UbuntuNumberAnimation {}
++        }
++
          onShiftedContentXChanged: {
              if (root.beingResized) {
                  // Flickabe.contentX wiggles during resizes. Don't react to it.
@@ -325,12 +362,17 @@
              } else if (shiftedContentX < positionMarker3 * width) {
                  snapTo(1);
              } else if (phase < 2){
--                // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
--                snapAnimation.targetContentX = width * positionMarker4 + 1 - shift;
--                snapAnimation.start();
++                snapToSpread();
                  root.opened();
+             }
+         }
++
++        function snapToSpread() {
++            // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
++            snapAnimation.targetContentX = (root.width * spreadView.positionMarker4) + 1 - spreadView.shift;
++            snapAnimation.start();
++        }
++
          function snapTo(index) {
              if (!root.altTabEnabled) {
                  // Reset to start instead
@@ -433,6 +475,7 @@
                      maximizedAppTopMargin: root.maximizedAppTopMargin
                      dropShadow: spreadView.active || priv.focusedAppDelegateIsDislocated
                      focusFirstApp: root.focusFirstApp
++                    highlightShown: root.altTabPressed && index === priv.highlightIndex
                      readonly property bool isDash: model.appId == "unity8-dash"
@@ -665,9 +708,7 @@
          edge: Qt.RightEdge
          onPassed: {
--            // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
--            snapAnimation.targetContentX = (root.width * spreadView.positionMarker4) + 1 - spreadView.shift;
--            snapAnimation.start();
++            spreadView.snapToSpread();
+         }
          material: Component {
              Item {
 === modified file 'qml/Stages/SpreadDelegate.qml'
 --- qml/Stages/SpreadDelegate.qml	2015-11-04 14:57:45 +0000
 +++ qml/Stages/SpreadDelegate.qml	2016-03-10 12:03:17 +0000
@@ -43,6 +43,7 @@
      property int shellOrientationAngle
      property int shellOrientation
      property QtObject orientations
++    property bool highlightShown: false
      function matchShellOrientation() {
          if (!root.application)
@@ -261,6 +262,25 @@
                  Behavior on opacity { UbuntuNumberAnimation {} }
+             }
++            Rectangle {
++                id: selectionHighlight
++                objectName: "selectionHighlight"
++                anchors.fill: appWindow
++                anchors.margins: -units.gu(1)
++                color: "white"
++                opacity: root.highlightShown ? 0.15 : 0
++                antialiasing: true
++                visible: opacity > 0
++            }
++
++            Rectangle {
++                anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
++                height: units.dp(2)
++                color: UbuntuColors.orange
++                visible: root.highlightShown
++                antialiasing: true
++            }
++
              ApplicationWindow {
                  id: appWindow
                  objectName: application ? "appWindow_" + application.appId : "appWindow_null"
 === modified file 'qml/Stages/TabletStage.qml'
 --- qml/Stages/TabletStage.qml	2016-03-10 12:03:17 +0000
 +++ qml/Stages/TabletStage.qml	2016-03-10 12:03:17 +0000
@@ -108,6 +108,38 @@
          priv.oldInverseProgress = inverseProgress;
+     }
++    onAltTabPressedChanged: {
++        if (!spreadEnabled) {
++            return;
++        }
++        if (altTabPressed) {
++            priv.highlightIndex = Math.min(spreadRepeater.count - 1, 1);
++            spreadView.snapToSpread();
++        } else {
++            for (var i = 0; i < spreadRepeater.count; i++) {
++                if (spreadRepeater.itemAt(i).zIndex === priv.highlightIndex) {
++                    spreadView.snapTo(i);
++                    return;
++                }
++            }
++        }
++    }
++
++    FocusScope {
++        focus: root.altTabPressed
++
++        Keys.onPressed: {
++            switch (event.key) {
++            case Qt.Key_Tab:
++                priv.highlightIndex = (priv.highlightIndex + 1) % spreadRepeater.count
++                break;
++            case Qt.Key_Backtab:
++                priv.highlightIndex = (priv.highlightIndex + spreadRepeater.count - 1) % spreadRepeater.count
++                break;
++            }
++        }
++    }
++
      QtObject {
          id: priv
          objectName: "stagesPriv"
@@ -136,6 +168,8 @@
          property int oldInverseProgress: 0
++        property int highlightIndex: 0
++
          onFocusedAppIdChanged: {
              if (priv.focusedAppId.length > 0) {
                  var focusedApp = ApplicationManager.findApplication(focusedAppId);
@@ -191,6 +225,10 @@
+             }
              return oneWayFlick;
+         }
++
++        onHighlightIndexChanged: {
++            spreadView.contentX = highlightIndex * spreadView.contentWidth / (spreadRepeater.count + 2)
++        }
+     }
      Connections {
@@ -397,11 +435,16 @@
              } else if (shiftedContentX < phase1Width) {
                  snapTo(1);
              } else {
--                // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
--                snapAnimation.targetContentX = spreadView.width * spreadView.positionMarker4 + 1 - shift;
--                snapAnimation.start();
++                snapToSpread();
+             }
+         }
++
++        function snapToSpread() {
++            // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
++            snapAnimation.targetContentX = (spreadView.width * spreadView.positionMarker4) + 1 - shift;
++            snapAnimation.start();
++        }
++
          function snapTo(index) {
              spreadView.selectedIndex = index;
              snapAnimation.targetContentX = -shift;
@@ -487,6 +530,11 @@
+             }
+         }
++        Behavior on contentX {
++            enabled: root.altTabPressed
++            UbuntuNumberAnimation {}
++        }
++
          MouseArea {
              id: spreadRow
              x: spreadView.contentX
@@ -617,6 +665,7 @@
                      dragOffset: !isDash && model.appId == priv.mainStageAppId && root.inverseProgress > 0 && spreadView.phase === 0 ? root.inverseProgress : 0
                      application: ApplicationManager.get(index)
                      closeable: !isDash
++                    highlightShown: root.altTabPressed && priv.highlightIndex == zIndex
                      readonly property bool wantsMainStage: model.stage == ApplicationInfoInterface.MainStage
@@ -819,9 +868,7 @@
          edge: Qt.RightEdge
          onPassed: {
--            // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
--            snapAnimation.targetContentX = (root.width * spreadView.positionMarker4) + 1 - spreadView.shift;
--            snapAnimation.start();
++            spreadView.snapToSpread();
+         }
          material: Component {
              Item {
 === modified file 'tests/qmltests/Stages/tst_SpreadDelegate.qml'
 --- tests/qmltests/Stages/tst_SpreadDelegate.qml	2015-11-04 14:57:45 +0000
 +++ tests/qmltests/Stages/tst_SpreadDelegate.qml	2016-03-10 12:03:17 +0000
@@ -308,5 +308,12 @@
              tryCompare(closeAnimation, "running", false);
+         }
++        function test_showHighLight() {
++            loadWithGalleryApp.clicked();
++            var highlightRect = findChild(spreadDelegateLoader.item, "selectionHighlight")
++            tryCompare(highlightRect, "visible", false)
++            spreadDelegateLoader.item.highlightShown = true;
++            tryCompare(highlightRect, "visible", true)
++        }
+     }
+ }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-03-10 12:03:17 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-03-10 12:03:17 +0000
@@ -1447,9 +1447,17 @@
              tryCompare(galleryApp, "requestedState", ApplicationInfoInterface.RequestedRunning);
+         }
--        function test_altTabSwitchesFocus() {
--            loadShell("desktop");
--            shell.usageScenario = "desktop"
++        function test_altTabSwitchesFocus_data() {
++            return [
++                { tag: "windowed", shellType: "desktop" },
++                { tag: "staged", shellType: "phone" },
++                { tag: "sidestaged", shellType: "tablet" }
++            ];
++        }
++
++        function test_altTabSwitchesFocus(data) {
++            loadShell(data.shellType);
++            shell.usageScenario = data.shellType;
              waitForRendering(root)
              var desktopStage = findChild(shell, "stage");
@@ -1467,18 +1475,10 @@
              keyClick(Qt.Key_Tab, Qt.AltModifier)
              tryCompare(app2.session.lastSurface, "activeFocus", true)
--            var desktopSpread = findChild(shell, "spread")
--
--            tryCompare(desktopSpread, "state", "")
--
--            // Just press Alt, make sure the spread comes up
++            // Press Alt+Tab
              keyPress(Qt.Key_Alt);
              keyClick(Qt.Key_Tab);
--            tryCompare(desktopSpread, "state", "altTab")
--
--            // Release control, check if spread disappears
              keyRelease(Qt.Key_Alt)
--            tryCompare(desktopSpread, "state", "")
              // Focus should have switched back now
              tryCompare(app3.session.lastSurface, "activeFocus", true)