Unity 8

Merge lp:~dandrader/unity8/mouseClickSwitchesSurfaceFocus into lp:unity8

mouseClickSwitchesSurfaceFocus
Merge into trunk

Proposed by Daniel d'Andrada on 2015-03-12

Status:	Merged
Approved by:	Michael Zanetti on 2015-03-24
Approved revision:	1667
Merged at revision:	1710
Proposed branch:	lp:~dandrader/unity8/mouseClickSwitchesSurfaceFocus
Merge into:	lp:unity8
Prerequisite:	lp:~dandrader/unity8/controlTouchEmulationFromQML
Diff against target:	432 lines (+234/-18) 10 files modified plugins/Ubuntu/Gestures/TouchGate.cpp (+0/-2) plugins/Ubuntu/Gestures/TouchGate.h (+0/-2) plugins/Utils/CMakeLists.txt (+1/-0) plugins/Utils/inputwatcher.cpp (+118/-0) plugins/Utils/inputwatcher.h (+58/-0) plugins/Utils/plugin.cpp (+2/-0) qml/Stages/SurfaceContainer.qml (+12/-9) tests/mocks/Unity/Application/MirSurfaceItem.cpp (+6/-0) tests/mocks/Unity/Application/MirSurfaceItem.h (+5/-0) tests/qmltests/Stages/tst_SurfaceContainer.qml (+32/-5)
To merge this branch:	bzr merge lp:~dandrader/unity8/mouseClickSwitchesSurfaceFocus
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-03-24
Michael Zanetti (community)		2015-03-12	Approve on 2015-03-24
Review via email: mp+252745@code.launchpad.net

Commit Message

Surface gets active focus also with mouse clicks

Description of the Change

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

* 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?
Not applicable

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

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

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/mouseClickSwitchesSurfaceFocus updated on 2015-03-12

1664. By Daniel d'Andrada on 2015-03-12: Remove comment

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

lp:~dandrader/unity8/mouseClickSwitchesSurfaceFocus updated on 2015-03-13

1665. By Daniel d'Andrada on 2015-03-13: Just to trigger a new Jenkins build

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-03-19:

Lots of segfaults in the qmluitests, you may want to revise those

lp:~dandrader/unity8/mouseClickSwitchesSurfaceFocus updated on 2015-03-19

1666. By Daniel d'Andrada on 2015-03-19

Merge trunk

[ Albert Astals Cid ]
* Add some context to tr calls (LP: #1431497)
* Require binaries and .pc files we call from code
* Test: More stubborn flick to the end
[ Andrea Cimitan ]
* Refactor PreviewOverlay to fix weird zoom out/in animations when
  previewing images from the Previews
[ CI Train Bot ]
* Resync trunk.
[ Charles Kerr ]
* Re-enable a rotation lock test now that the bug that broke that test
  has been fixed. (LP: #1410915)
[ Daniel d'Andrada ]
* Darkened area behind indicators menu should eat input until it fully
  disappears (LP: #1417967)
* DesktopStage - fix focus switch when user taps on window (LP:
  #1431325)
* Fix warnings when launching tutorial
* Make MouseTouchAdaptor controllable from within QML
* Make tst_Shell absorb tst_TabletShell
[ Leo Arias ]
* Changed the autopilot dependencies so they do not require qt4. (LP:
  #1429158)
* Drop the support for python2 in autopilot tests. (LP: #1429163)
* Stop using the deprecated toolkit emulators namespace in autopilot
  tests. (LP: #1341681)
[ Michael Terry ]
* Don't close wizard & edge tutorial when the unity8-dash closes (LP:
  #1425484)
* Don't let the wizard sit indefinitely, waiting for a wizard page to
  finish preparing itself. (LP: #1425737)
* Fix two broken qmluitest files by waiting for everything to settle
  before starting the tests.
* Only call unlockAllModems once the wizard is done. (LP: #1425161)
  (LP: #1425161)
* When we are locking the user out from too many login failures,
  notice when time passes even if the device is suspended. (LP:
  #1396817) (LP: #1396817)
[ Michael Zanetti ]
* Add a mouse area to the indicators panel so we can open them by
  clicking. (LP: #1417650)
* fix launcher not reacting to first click when revealed by mouse
  hover, add tests
* performance improvements (LP: #1430233, #1425087)
[ Michał Sawicz ]
* Remove the activity indicator from tests
* Use targets instead of custom ld arguments for linking
[ Mirco Müller ]
* Updated the visuals of the SwipeToAct-widget for incoming-call snap-
  decision notifications according to new design-spec.
* Updated the visuals of the SwipeToAct-widget for incoming-call snap-
  decision notifications according to new design-spec.
* No-change rebuild against Qt 5.4.1.

1667. By Daniel d'Andrada on 2015-03-19

Handle null targets properly

Daniel d'Andrada (dandrader) wrote on 2015-03-19:

> Lots of segfaults in the qmluitests, you may want to revise those

Fixed. Thanks.

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

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

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2015-03-24:

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

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

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

yes

review: Approve

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

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

review: Needs Fixing (continuous-integration)

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:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team

 === modified file 'plugins/Ubuntu/Gestures/TouchGate.cpp'
 --- plugins/Ubuntu/Gestures/TouchGate.cpp	2015-01-28 12:59:21 +0000
 +++ plugins/Ubuntu/Gestures/TouchGate.cpp	2015-03-19 14:42:50 +0000
@@ -53,8 +53,6 @@
              m_touchInfoMap[touchPoint.id()].ownership = OwnershipRequested;
              m_touchInfoMap[touchPoint.id()].ended = false;
              TouchRegistry::instance()->requestTouchOwnership(touchPoint.id(), this);
--
--            Q_EMIT pressed();
+         }
          goodToGo &= m_touchInfoMap.contains(touchPoint.id())
 === modified file 'plugins/Ubuntu/Gestures/TouchGate.h'
 --- plugins/Ubuntu/Gestures/TouchGate.h	2015-01-28 12:59:21 +0000
 +++ plugins/Ubuntu/Gestures/TouchGate.h	2015-03-19 14:42:50 +0000
@@ -53,8 +53,6 @@
  Q_SIGNALS:
      void targetItemChanged(QQuickItem *item);
--    void pressed();
--
  protected:
      void touchEvent(QTouchEvent *event) override;
  private:
 === modified file 'plugins/Utils/CMakeLists.txt'
 --- plugins/Utils/CMakeLists.txt	2015-02-11 17:12:22 +0000
 +++ plugins/Utils/CMakeLists.txt	2015-03-19 14:42:50 +0000
@@ -8,6 +8,7 @@
+ )
  set(QMLPLUGIN_SRC
++    inputwatcher.cpp
      qlimitproxymodelqml.cpp
      unitysortfilterproxymodelqml.cpp
      relativetimeformatter.cpp
 === added file 'plugins/Utils/inputwatcher.cpp'
 --- plugins/Utils/inputwatcher.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Utils/inputwatcher.cpp	2015-03-19 14:42:50 +0000
@@ -0,0 +1,118 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#include "inputwatcher.h"
++
++#include <QMouseEvent>
++
++InputWatcher::InputWatcher(QObject *parent)
++    : QObject(parent)
++    , m_mousePressed(false)
++    , m_touchPressed(false)
++{
++}
++
++QObject *InputWatcher::target() const
++{
++    return m_target;
++}
++
++void InputWatcher::setTarget(QObject *value)
++{
++    if (m_target == value) {
++        return;
++    }
++
++    if (m_target) {
++        m_target->removeEventFilter(this);
++    }
++
++    setMousePressed(false);
++    setTouchPressed(false);
++
++    m_target = value;
++    if (m_target) {
++        m_target->installEventFilter(this);
++    }
++
++    Q_EMIT targetChanged(value);
++}
++
++bool InputWatcher::targetPressed() const
++{
++    return m_mousePressed || m_touchPressed;
++}
++
++bool InputWatcher::eventFilter(QObject* /*watched*/, QEvent *event)
++{
++    switch (event->type()) {
++    case QEvent::TouchBegin:
++        setTouchPressed(true);
++        break;
++    case QEvent::TouchEnd:
++        setTouchPressed(false);
++        break;
++    case QEvent::MouseButtonPress:
++        {
++            QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
++            if (mouseEvent->button() == Qt::LeftButton) {
++                setMousePressed(true);
++            }
++        }
++        break;
++    case QEvent::MouseButtonRelease:
++        {
++            QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
++            if (mouseEvent->button() == Qt::LeftButton) {
++                setMousePressed(false);
++            }
++        }
++        break;
++    default:
++        // Not interested
++        break;
++    }
++
++    // We never filter them out. We are just watching.
++    return false;
++}
++
++void InputWatcher::setMousePressed(bool value)
++{
++    if (value == m_mousePressed) {
++        return;
++    }
++
++    bool oldPressed = targetPressed();
++    m_mousePressed = value;
++    if (targetPressed() != oldPressed) {
++        Q_EMIT targetPressedChanged(targetPressed());
++    }
++}
++
++void InputWatcher::setTouchPressed(bool value)
++{
++    if (value == m_touchPressed) {
++        return;
++    }
++
++    bool oldPressed = targetPressed();
++    m_touchPressed = value;
++    if (targetPressed() != oldPressed) {
++        Q_EMIT targetPressedChanged(targetPressed());
++    }
++}
 === added file 'plugins/Utils/inputwatcher.h'
 --- plugins/Utils/inputwatcher.h	1970-01-01 00:00:00 +0000
 +++ plugins/Utils/inputwatcher.h	2015-03-19 14:42:50 +0000
@@ -0,0 +1,58 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#ifndef UNITY_INPUTWATCHER_H
++#define UNITY_INPUTWATCHER_H
++
++#include <QObject>
++#include <QPointer>
++
++/*
++  Monitors the target object for input events to figure out whether it's pressed
++  or not.
++ */
++class InputWatcher : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(QObject* target READ target WRITE setTarget NOTIFY targetChanged)
++
++    // Whether the target object is pressed (by either touch or mouse)
++    Q_PROPERTY(bool targetPressed READ targetPressed NOTIFY targetPressedChanged)
++public:
++    InputWatcher(QObject *parent = nullptr);
++
++    QObject *target() const;
++    void setTarget(QObject *value);
++
++    bool targetPressed() const;
++
++    bool eventFilter(QObject *watched, QEvent *event) override;
++
++Q_SIGNALS:
++    void targetChanged(QObject *value);
++    void targetPressedChanged(bool value);
++
++private:
++    void setMousePressed(bool value);
++    void setTouchPressed(bool value);
++
++    bool m_mousePressed;
++    bool m_touchPressed;
++    QPointer<QObject> m_target;
++};
++
++#endif // UNITY_INPUTWATCHER_H
 === modified file 'plugins/Utils/plugin.cpp'
 --- plugins/Utils/plugin.cpp	2015-02-10 17:03:11 +0000
 +++ plugins/Utils/plugin.cpp	2015-03-19 14:42:50 +0000
@@ -26,6 +26,7 @@
  #include "plugin.h"
  // local
++#include "inputwatcher.h"
  #include "qlimitproxymodelqml.h"
  #include "unitysortfilterproxymodelqml.h"
  #include "relativetimeformatter.h"
@@ -55,6 +56,7 @@
      qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
      qmlRegisterType<RelativeTimeFormatter>(uri, 0, 1, "RelativeTimeFormatter");
      qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);
++    qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");
+ }
  void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 === modified file 'qml/Stages/SurfaceContainer.qml'
 --- qml/Stages/SurfaceContainer.qml	2015-01-28 12:59:21 +0000
 +++ qml/Stages/SurfaceContainer.qml	2015-03-19 14:42:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2014 Canonical Ltd.
++ * Copyright 2014-2015 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
@@ -17,6 +17,7 @@
  import QtQuick 2.0
  import Ubuntu.Components 1.1
  import Ubuntu.Gestures 0.1 // For TouchGate
++import Utils 0.1 // for InputWatcher
  FocusScope {
      id: root
@@ -26,8 +27,6 @@
      property int orientation
      property bool interactive
--    signal surfacePressed()
--
      onSurfaceChanged: {
          if (surface) {
              // Set the surface focus *after* it is added to the scene to
@@ -45,17 +44,21 @@
      Binding { target: surface; property: "enabled"; value: root.interactive; when: surface }
      Binding { target: surface; property: "antialiasing"; value: !root.interactive; when: surface }
++    InputWatcher {
++        target: root.surface
++        onTargetPressedChanged: {
++            if (targetPressed && root.interactive) {
++                root.focus = true;
++                root.forceActiveFocus();
++            }
++        }
++    }
++
      TouchGate {
          targetItem: surface
          anchors.fill: root
          enabled: root.surface ? root.surface.enabled : false
          z: 2
--        onPressed: {
--            root.focus = true;
--            if (root.interactive) {
--                root.forceActiveFocus();
--            }
--        }
+     }
      states: [
 === modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
 --- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2014-10-01 13:20:32 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2015-03-19 14:42:50 +0000
@@ -47,6 +47,12 @@
+ {
      qDebug() << "MirSurfaceItem::MirSurfaceItem() " << this->name();
++    setAcceptedMouseButtons(Qt::LeftButton | Qt::MiddleButton | Qt::RightButton |
++        Qt::ExtraButton1 | Qt::ExtraButton2 | Qt::ExtraButton3 | Qt::ExtraButton4 |
++        Qt::ExtraButton5 | Qt::ExtraButton6 | Qt::ExtraButton7 | Qt::ExtraButton8 |
++        Qt::ExtraButton9 | Qt::ExtraButton10 | Qt::ExtraButton11 |
++        Qt::ExtraButton12 | Qt::ExtraButton13);
++
      QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
      connect(this, &QQuickItem::focusChanged,
 === modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
 --- tests/mocks/Unity/Application/MirSurfaceItem.h	2014-10-01 13:20:32 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceItem.h	2015-03-19 14:42:50 +0000
@@ -104,6 +104,11 @@
  protected:
      void touchEvent(QTouchEvent * event) override;
++    // becaue the default implementation ignores the events
++    void mousePressEvent(QMouseEvent *) override {}
++    void mouseMoveEvent(QMouseEvent *) override {}
++    void mouseReleaseEvent(QMouseEvent *) override {}
++
  private Q_SLOTS:
      void onFocusChanged();
      void onComponentStatusChanged(QQmlComponent::Status status);
 === modified file 'tests/qmltests/Stages/tst_SurfaceContainer.qml'
 --- tests/qmltests/Stages/tst_SurfaceContainer.qml	2014-10-01 13:20:32 +0000
 +++ tests/qmltests/Stages/tst_SurfaceContainer.qml	2015-03-19 14:42:50 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2014 Canonical Ltd.
++ * Copyright 2014-2015 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  import QtQuick 2.0
  import QtTest 1.0
--import Unity.Test 0.1 as UT
++import Unity.Test 0.1
  import ".."
  import "../../../qml/Stages"
  import Ubuntu.Components 0.1
@@ -32,6 +32,8 @@
          id: surfaceContainerComponent
          SurfaceContainer {
              anchors.fill: parent
++            orientation: Qt.PortraitOrientation
++            interactive: interactiveCheckbox.checked
+         }
+     }
      Loader {
@@ -85,6 +87,12 @@
                  CheckBox {id: fullscreenCheckbox; checked: true; }
                  Label { text: "fullscreen" }
+             }
++            Row {
++                anchors { left: parent.left; right: parent.right }
++                CheckBox {id: interactiveCheckbox; checked: true; }
++                Label { text: "interactive" }
++            }
++            MouseTouchEmulationCheckbox {}
+         }
+     }
@@ -94,7 +102,7 @@
          signalName: "surfaceDestroyed"
+     }
--    UT.UnityTestCase {
++    UnityTestCase {
          id: testCase
          name: "SurfaceContainer"
          when: windowShown
@@ -110,6 +118,8 @@
              tryCompare(surfaceContainerLoader.item, "surface", null);
              surfaceSpy.clear();
++
++            interactiveCheckbox.checked = true;
+         }
          /*
@@ -145,14 +155,13 @@
              surfaceContainer.surface.touchPressCount = 0;
              surfaceContainer.surface.touchReleaseCount = 0;
--            surfaceContainer.interactive = true;
              tap(surfaceContainer, surfaceContainer.width / 2, surfaceContainer.height / 2);
              // surface got touches as the surfaceContainer is interactive
              compare(surfaceContainer.surface.touchPressCount, 1)
              compare(surfaceContainer.surface.touchReleaseCount, 1);
--            surfaceContainer.interactive = false;
++            interactiveCheckbox.checked = false;
              tap(surfaceContainer, surfaceContainer.width / 2, surfaceContainer.height / 2);
              // surface shouldn't get the touches from the second tap as the surfaceContainer
@@ -160,5 +169,23 @@
              compare(surfaceContainer.surface.touchPressCount, 1)
              compare(surfaceContainer.surface.touchReleaseCount, 1);
+         }
++
++        function test_surfaceGetsActiveFocusOnMousePress() {
++            surfaceCheckbox.checked = true;
++            verify(surfaceContainer.surface !== null);
++
++            compare(surfaceContainer.surface.activeFocus, false);
++            mouseClick(surfaceContainer);
++            compare(surfaceContainer.surface.activeFocus, true);
++        }
++
++        function test_surfaceGetsActiveFocusOnTap() {
++            surfaceCheckbox.checked = true;
++            verify(surfaceContainer.surface !== null);
++
++            compare(surfaceContainer.surface.activeFocus, false);
++            tap(surfaceContainer);
++            compare(surfaceContainer.surface.activeFocus, true);
++        }
+     }
+ }