Merge into trunk : multi-monitor : Code : Unity API

Status:	Needs review
Proposed branch:	lp:~nick-dedekind/unity-api/multi-monitor
Merge into:	lp:unity-api
Diff against target:	93 lines (+20/-26) 4 files modified debian/changelog (+7/-0) include/unity/shell/application/CMakeLists.txt (+3/-0) include/unity/shell/application/MirMousePointerInterface.h (+2/-23) include/unity/shell/application/MirPlatformCursor.h (+8/-3)
To merge this branch:	bzr merge lp:~nick-dedekind/unity-api/multi-monitor
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-04-05
Unity Team		2017-01-16	Pending
Review via email: mp+314837@code.launchpad.net

Commit message

API requirements for multiple screen support

Description of the change

Added register/unregisterMMouseCursors so that mouse cursor will not be overwritten during fleeting states when creating windows secondary screens.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-08:

#

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

review: Approve (continuous-integration)

Reply

lp:~nick-dedekind/unity-api/multi-monitor updated on 2017-03-24

251. By Nick Dedekind on 2017-03-24: merged with trunk

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-24:

#

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

review: Approve (continuous-integration)

Reply

lp:~nick-dedekind/unity-api/multi-monitor updated on 2017-04-05

252. By Nick Dedekind on 2017-04-05: bump

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-04-05:

#

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

review: Approve (continuous-integration)

Reply

Unmerged revisions

252. By Nick Dedekind on 2017-04-05: bump
251. By Nick Dedekind on 2017-03-24: merged with trunk
250. By Nick Dedekind on 2017-02-28: fixed changelog
249. By Nick Dedekind on 2017-02-28: merged trunk
248. By Nick Dedekind on 2017-02-22: merged parent
247. By Nick Dedekind on 2017-02-10: version bump
246. By Nick Dedekind on 2017-02-07: merged with trunk
245. By Nick Dedekind on 2017-01-27: merged with parent
244. By Nick Dedekind on 2017-01-18: updated cursor interface
243. By Nick Dedekind on 2017-01-16: merged with trunk

 === modified file 'debian/changelog'
 --- debian/changelog	2017-03-17 11:08:20 +0000
 +++ debian/changelog	2017-04-05 11:26:31 +0000
@@ -1,3 +1,10 @@
++unity-api (8.7ubuntu2) UNRELEASED; urgency=medium
++
++  [ Nick Dedekind ]
++  * MirPlatformCursor - updates for multi-screen.
++
++ -- Nick Dedekind <nick.dedekind@canonical.com>  Wed, 05 Apr 2017 12:26:08 +0100
++
  unity-api (8.6+17.04.20170317-0ubuntu1) zesty; urgency=medium
    [ Michael Zanetti ]
 === modified file 'include/unity/shell/application/CMakeLists.txt'
 --- include/unity/shell/application/CMakeLists.txt	2017-03-17 11:07:57 +0000
 +++ include/unity/shell/application/CMakeLists.txt	2017-04-05 11:26:31 +0000
@@ -3,6 +3,9 @@
  file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
  file(GLOB internal_headers "${CMAKE_CURRENT_SOURCE_DIR}/internal/*.h")
++add_custom_target(appheaders
++                  SOURCES ${headers} ${internal_headers})
++
  install(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR})
  set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 === modified file 'include/unity/shell/application/MirMousePointerInterface.h'
 --- include/unity/shell/application/MirMousePointerInterface.h	2016-05-18 20:51:23 +0000
 +++ include/unity/shell/application/MirMousePointerInterface.h	2017-04-05 11:26:31 +0000
@@ -54,6 +54,8 @@
      virtual void setThemeName(const QString &themeName) = 0;
      virtual QString themeName() const = 0;
++
++    virtual void moveTo(const QPoint& position) = 0;
      /// @endcond
      /**
@@ -70,29 +72,6 @@
      void cursorNameChanged(QString name);
      void themeNameChanged(QString name);
      /// @endcond
--
--public Q_SLOTS:
--    /**
--     * @brief Handler for Mir mouse events
--     * The implementation should respond to Mir mouse events by moving itself along its parent
--     * area.
--     * This is called by Mir's platform cursor.
--     *
--     * Note that we get only relative mouse movement, since the mouse pointer position is defined
--     * by this very item. Ie., it's up to this class to decide whether or not it (the mouse pointer)
--     * should move (and how much) due to movement in a mouse device.
--     *
--     * @param movement Movement vector
--     */
--    virtual void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
--            Qt::KeyboardModifiers modifiers) = 0;
--
--    /**
--     * @brief Handler for Mir mouse wheel events
--     * This is called by Mir's platform cursor.
--     */
--    virtual void handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers) = 0;
--
  };
  #endif // MIR_MOUSE_POINTER_INTERFACE_H
 === modified file 'include/unity/shell/application/MirPlatformCursor.h'
 --- include/unity/shell/application/MirPlatformCursor.h	2015-09-18 16:00:09 +0000
 +++ include/unity/shell/application/MirPlatformCursor.h	2017-04-05 11:26:31 +0000
@@ -30,9 +30,14 @@
+ {
  public:
      /**
--     * @brief Set the QML mouse pointer that this platform cursor will talk to
--     */
--    virtual void setMousePointer(MirMousePointerInterface *mousePointer) = 0;
++     * @brief Register a mouse pointer that this platform cursor will talk to
++     */
++    virtual void registerMousePointer(MirMousePointerInterface *mousePointer) = 0;
++
++    /**
++     * @brief Unregister a mouse pointer that this platform cursor will talk to
++     */
++    virtual void unregisterMousePointer(MirMousePointerInterface *mousePointer) = 0;
  };
  #endif // MIR_PLATFORM_CURSOR_H

Unity API

Merge lp:~nick-dedekind/unity-api/multi-monitor into lp:unity-api

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers