1
=== modified file 'debian/changelog'
2
--- debian/changelog	2017-03-17 11:08:20 +0000
3
+++ debian/changelog	2017-04-05 11:26:31 +0000
4
@@ -1,3 +1,10 @@
5
1
unity-api (8.7ubuntu2) UNRELEASED; urgency=medium
6
2
7
3
  [ Nick Dedekind ]
8
4
  * MirPlatformCursor - updates for multi-screen.
9
5
10
6
 -- Nick Dedekind <nick.dedekind@canonical.com>  Wed, 05 Apr 2017 12:26:08 +0100
11
7
12
1
unity-api (8.6+17.04.20170317-0ubuntu1) zesty; urgency=medium
8
unity-api (8.6+17.04.20170317-0ubuntu1) zesty; urgency=medium
13
2
9
14
3
  [ Michael Zanetti ]
10
  [ Michael Zanetti ]
15
4
11
16
=== modified file 'include/unity/shell/application/CMakeLists.txt'
17
--- include/unity/shell/application/CMakeLists.txt	2017-03-17 11:07:57 +0000
18
+++ include/unity/shell/application/CMakeLists.txt	2017-04-05 11:26:31 +0000
19
@@ -3,6 +3,9 @@
20
3
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
3
file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
21
4
file(GLOB internal_headers "${CMAKE_CURRENT_SOURCE_DIR}/internal/*.h")
4
file(GLOB internal_headers "${CMAKE_CURRENT_SOURCE_DIR}/internal/*.h")
22
5
5
23
6
add_custom_target(appheaders
24
7
                  SOURCES ${headers} ${internal_headers})
25
8
26
6
install(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR})
9
install(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR})
27
7
10
28
8
set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
11
set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
29
9
12
30
=== modified file 'include/unity/shell/application/MirMousePointerInterface.h'
31
--- include/unity/shell/application/MirMousePointerInterface.h	2016-05-18 20:51:23 +0000
32
+++ include/unity/shell/application/MirMousePointerInterface.h	2017-04-05 11:26:31 +0000
33
@@ -54,6 +54,8 @@
34
54
54
35
55
    virtual void setThemeName(const QString &themeName) = 0;
55
    virtual void setThemeName(const QString &themeName) = 0;
36
56
    virtual QString themeName() const = 0;
56
    virtual QString themeName() const = 0;
37
57
38
58
    virtual void moveTo(const QPoint& position) = 0;
39
57
    /// @endcond
59
    /// @endcond
40
58
60
41
59
    /**
61
    /**
42
@@ -70,29 +72,6 @@
43
70
    void cursorNameChanged(QString name);
72
    void cursorNameChanged(QString name);
44
71
    void themeNameChanged(QString name);
73
    void themeNameChanged(QString name);
45
72
    /// @endcond
74
    /// @endcond
46
73
47
74
public Q_SLOTS:
48
75
    /**
49
76
     * @brief Handler for Mir mouse events
50
77
     * The implementation should respond to Mir mouse events by moving itself along its parent
51
78
     * area.
52
79
     * This is called by Mir's platform cursor.
53
80
     *
54
81
     * Note that we get only relative mouse movement, since the mouse pointer position is defined
55
82
     * by this very item. Ie., it's up to this class to decide whether or not it (the mouse pointer)
56
83
     * should move (and how much) due to movement in a mouse device.
57
84
     *
58
85
     * @param movement Movement vector
59
86
     */
60
87
    virtual void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
61
88
            Qt::KeyboardModifiers modifiers) = 0;
62
89
63
90
    /**
64
91
     * @brief Handler for Mir mouse wheel events
65
92
     * This is called by Mir's platform cursor.
66
93
     */
67
94
    virtual void handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers) = 0;
68
95
69
96
};
75
};
70
97
76
71
98
#endif // MIR_MOUSE_POINTER_INTERFACE_H
77
#endif // MIR_MOUSE_POINTER_INTERFACE_H
72
99
78
73
=== modified file 'include/unity/shell/application/MirPlatformCursor.h'
74
--- include/unity/shell/application/MirPlatformCursor.h	2015-09-18 16:00:09 +0000
75
+++ include/unity/shell/application/MirPlatformCursor.h	2017-04-05 11:26:31 +0000
76
@@ -30,9 +30,14 @@
77
30
{
30
{
78
31
public:
31
public:
79
32
    /**
32
    /**
83
33
     * @brief Set the QML mouse pointer that this platform cursor will talk to
33
     * @brief Register a mouse pointer that this platform cursor will talk to
84
34
     */
34
     */
85
35
    virtual void setMousePointer(MirMousePointerInterface *mousePointer) = 0;
35
    virtual void registerMousePointer(MirMousePointerInterface *mousePointer) = 0;
86
36
87
37
    /**
88
38
     * @brief Unregister a mouse pointer that this platform cursor will talk to
89
39
     */
90
40
    virtual void unregisterMousePointer(MirMousePointerInterface *mousePointer) = 0;
91
36
};
41
};
92
37
42
93
38
#endif // MIR_PLATFORM_CURSOR_H
43
#endif // MIR_PLATFORM_CURSOR_H
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
1	=== modified file 'debian/changelog'
2	--- debian/changelog 2017-03-17 11:08:20 +0000
3	+++ debian/changelog 2017-04-05 11:26:31 +0000
4	@@ -1,3 +1,10 @@
5			1	unity-api (8.7ubuntu2) UNRELEASED; urgency=medium
6			2
7			3	[ Nick Dedekind ]
8			4	* MirPlatformCursor - updates for multi-screen.
9			5
10			6	-- Nick Dedekind <nick.dedekind@canonical.com> Wed, 05 Apr 2017 12:26:08 +0100
11			7
12	1	unity-api (8.6+17.04.20170317-0ubuntu1) zesty; urgency=medium	8	unity-api (8.6+17.04.20170317-0ubuntu1) zesty; urgency=medium
13	2		9
14	3	[ Michael Zanetti ]	10	[ Michael Zanetti ]
15	4		11
16	=== modified file 'include/unity/shell/application/CMakeLists.txt'
17	--- include/unity/shell/application/CMakeLists.txt 2017-03-17 11:07:57 +0000
18	+++ include/unity/shell/application/CMakeLists.txt 2017-04-05 11:26:31 +0000
19	@@ -3,6 +3,9 @@
20	3	file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")	3	file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
21	4	file(GLOB internal_headers "${CMAKE_CURRENT_SOURCE_DIR}/internal/*.h")	4	file(GLOB internal_headers "${CMAKE_CURRENT_SOURCE_DIR}/internal/*.h")
22	5		5
23			6	add_custom_target(appheaders
24			7	SOURCES ${headers} ${internal_headers})
25			8
26	6	install(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR})	9	install(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR})
27	7		10
28	8	set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)	11	set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
29	9		12
30	=== modified file 'include/unity/shell/application/MirMousePointerInterface.h'
31	--- include/unity/shell/application/MirMousePointerInterface.h 2016-05-18 20:51:23 +0000
32	+++ include/unity/shell/application/MirMousePointerInterface.h 2017-04-05 11:26:31 +0000
33	@@ -54,6 +54,8 @@
34	54		54
35	55	virtual void setThemeName(const QString &themeName) = 0;	55	virtual void setThemeName(const QString &themeName) = 0;
36	56	virtual QString themeName() const = 0;	56	virtual QString themeName() const = 0;
37			57
38			58	virtual void moveTo(const QPoint& position) = 0;
39	57	/// @endcond	59	/// @endcond
40	58		60
41	59	/**	61	/**
42	@@ -70,29 +72,6 @@
43	70	void cursorNameChanged(QString name);	72	void cursorNameChanged(QString name);
44	71	void themeNameChanged(QString name);	73	void themeNameChanged(QString name);
45	72	/// @endcond	74	/// @endcond
46	73
47	74	public Q_SLOTS:
48	75	/**
49	76	* @brief Handler for Mir mouse events
50	77	* The implementation should respond to Mir mouse events by moving itself along its parent
51	78	* area.
52	79	* This is called by Mir's platform cursor.
53	80	*
54	81	* Note that we get only relative mouse movement, since the mouse pointer position is defined
55	82	* by this very item. Ie., it's up to this class to decide whether or not it (the mouse pointer)
56	83	* should move (and how much) due to movement in a mouse device.
57	84	*
58	85	* @param movement Movement vector
59	86	*/
60	87	virtual void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
61	88	Qt::KeyboardModifiers modifiers) = 0;
62	89
63	90	/**
64	91	* @brief Handler for Mir mouse wheel events
65	92	* This is called by Mir's platform cursor.
66	93	*/
67	94	virtual void handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers) = 0;
68	95
69	96	};	75	};
70	97		76
71	98	#endif // MIR_MOUSE_POINTER_INTERFACE_H	77	#endif // MIR_MOUSE_POINTER_INTERFACE_H
72	99		78
73	=== modified file 'include/unity/shell/application/MirPlatformCursor.h'
74	--- include/unity/shell/application/MirPlatformCursor.h 2015-09-18 16:00:09 +0000
75	+++ include/unity/shell/application/MirPlatformCursor.h 2017-04-05 11:26:31 +0000
76	@@ -30,9 +30,14 @@
77	30	{	30	{
78	31	public:	31	public:
79	32	/**	32	/**
83	33	* @brief Set the QML mouse pointer that this platform cursor will talk to	33	* @brief Register a mouse pointer that this platform cursor will talk to
84	34	*/	34	*/
85	35	virtual void setMousePointer(MirMousePointerInterface *mousePointer) = 0;	35	virtual void registerMousePointer(MirMousePointerInterface *mousePointer) = 0;
86			36
87			37	/**
88			38	* @brief Unregister a mouse pointer that this platform cursor will talk to
89			39	*/
90			40	virtual void unregisterMousePointer(MirMousePointerInterface *mousePointer) = 0;
91	36	};	41	};
92	37		42
93	38	#endif // MIR_PLATFORM_CURSOR_H	43	#endif // MIR_PLATFORM_CURSOR_H