1
=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
2
--- src/modules/Unity/Application/mirsurfacemanager.cpp	2016-02-11 11:58:16 +0000
3
+++ src/modules/Unity/Application/mirsurfacemanager.cpp	2016-02-16 13:34:50 +0000
4
@@ -114,6 +114,11 @@
5
114
    if (session)
114
    if (session)
6
115
        session->registerSurface(qmlSurface);
115
        session->registerSurface(qmlSurface);
7
116
116
8
117
    if (qmlSurface->type() == Mir::InputMethodType) {
9
118
        m_inputMethodSurface = qmlSurface;
10
119
        Q_EMIT inputMethodSurfaceChanged();
11
120
    }
12
121
13
117
    // Only notify QML of surface creation once it has drawn its first frame.
122
    // Only notify QML of surface creation once it has drawn its first frame.
14
118
    connect(qmlSurface, &MirSurfaceInterface::firstFrameDrawn, this, [=]() {
123
    connect(qmlSurface, &MirSurfaceInterface::firstFrameDrawn, this, [=]() {
15
119
        tracepoint(qtmir, firstFrameDrawn);
124
        tracepoint(qtmir, firstFrameDrawn);
16
@@ -155,8 +160,18 @@
17
155
        }
160
        }
18
156
    }
161
    }
19
157
162
20
163
    if (qmlSurface->type() == Mir::InputMethodType) {
21
164
        m_inputMethodSurface = nullptr;
22
165
        Q_EMIT inputMethodSurfaceChanged();
23
166
    }
24
167
25
158
    qmlSurface->setLive(false);
168
    qmlSurface->setLive(false);
26
159
    Q_EMIT surfaceDestroyed(qmlSurface);
169
    Q_EMIT surfaceDestroyed(qmlSurface);
27
160
}
170
}
28
161
171
29
172
MirSurfaceInterface* MirSurfaceManager::inputMethodSurface() const
30
173
{
31
174
    return m_inputMethodSurface;
32
175
}
33
176
34
162
} // namespace qtmir
177
} // namespace qtmir
35
163
178
36
=== modified file 'src/modules/Unity/Application/mirsurfacemanager.h'
37
--- src/modules/Unity/Application/mirsurfacemanager.h	2016-02-11 11:58:16 +0000
38
+++ src/modules/Unity/Application/mirsurfacemanager.h	2016-02-16 13:34:50 +0000
39
@@ -54,7 +54,7 @@
40
54
class MirSurfaceManager : public QObject
54
class MirSurfaceManager : public QObject
41
55
{
55
{
42
56
    Q_OBJECT
56
    Q_OBJECT
44
57
57
    Q_PROPERTY(MirSurfaceInterface* inputMethodSurface READ inputMethodSurface NOTIFY inputMethodSurfaceChanged)
45
58
public:
58
public:
46
59
    explicit MirSurfaceManager(
59
    explicit MirSurfaceManager(
47
60
        const QSharedPointer<MirServer>& mirServer,
60
        const QSharedPointer<MirServer>& mirServer,
48
@@ -66,7 +66,10 @@
49
66
66
50
67
    static MirSurfaceManager* singleton();
67
    static MirSurfaceManager* singleton();
51
68
68
52
69
    MirSurfaceInterface* inputMethodSurface() const;
53
70
54
69
Q_SIGNALS:
71
Q_SIGNALS:
55
72
    void inputMethodSurfaceChanged();
56
70
    void surfaceCreated(MirSurfaceInterface* surface);
73
    void surfaceCreated(MirSurfaceInterface* surface);
57
71
    void surfaceDestroyed(MirSurfaceInterface* surface);
74
    void surfaceDestroyed(MirSurfaceInterface* surface);
58
72
75
59
@@ -86,6 +89,7 @@
60
86
    mir::shell::Shell *const m_shell;
89
    mir::shell::Shell *const m_shell;
61
87
    SessionManager* m_sessionManager;
90
    SessionManager* m_sessionManager;
62
88
    static MirSurfaceManager *instance;
91
    static MirSurfaceManager *instance;
63
92
    MirSurfaceInterface* m_inputMethodSurface = nullptr;
64
89
};
93
};
65
90
94
66
91
} // namespace qtmir
95
} // namespace qtmir
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2016-02-15
Daniel d'Andrada (community)		2016-02-15	Approve on 2016-02-15
Unity8 CI Bot (community)	continuous-integration		Needs Fixing on 2016-02-15
Review via email: mp+286074@code.launchpad.net
1	=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
2	--- src/modules/Unity/Application/mirsurfacemanager.cpp 2016-02-11 11:58:16 +0000
3	+++ src/modules/Unity/Application/mirsurfacemanager.cpp 2016-02-16 13:34:50 +0000
4	@@ -114,6 +114,11 @@
5	114	if (session)	114	if (session)
6	115	session->registerSurface(qmlSurface);	115	session->registerSurface(qmlSurface);
7	116		116
8			117	if (qmlSurface->type() == Mir::InputMethodType) {
9			118	m_inputMethodSurface = qmlSurface;
10			119	Q_EMIT inputMethodSurfaceChanged();
11			120	}
12			121
13	117	// Only notify QML of surface creation once it has drawn its first frame.	122	// Only notify QML of surface creation once it has drawn its first frame.
14	118	connect(qmlSurface, &MirSurfaceInterface::firstFrameDrawn, this, [=]() {	123	connect(qmlSurface, &MirSurfaceInterface::firstFrameDrawn, this, [=]() {
15	119	tracepoint(qtmir, firstFrameDrawn);	124	tracepoint(qtmir, firstFrameDrawn);
16	@@ -155,8 +160,18 @@
17	155	}	160	}
18	156	}	161	}
19	157		162
20			163	if (qmlSurface->type() == Mir::InputMethodType) {
21			164	m_inputMethodSurface = nullptr;
22			165	Q_EMIT inputMethodSurfaceChanged();
23			166	}
24			167
25	158	qmlSurface->setLive(false);	168	qmlSurface->setLive(false);
26	159	Q_EMIT surfaceDestroyed(qmlSurface);	169	Q_EMIT surfaceDestroyed(qmlSurface);
27	160	}	170	}
28	161		171
29			172	MirSurfaceInterface* MirSurfaceManager::inputMethodSurface() const
30			173	{
31			174	return m_inputMethodSurface;
32			175	}
33			176
34	162	} // namespace qtmir	177	} // namespace qtmir
35	163		178
36	=== modified file 'src/modules/Unity/Application/mirsurfacemanager.h'
37	--- src/modules/Unity/Application/mirsurfacemanager.h 2016-02-11 11:58:16 +0000
38	+++ src/modules/Unity/Application/mirsurfacemanager.h 2016-02-16 13:34:50 +0000
39	@@ -54,7 +54,7 @@
40	54	class MirSurfaceManager : public QObject	54	class MirSurfaceManager : public QObject
41	55	{	55	{
42	56	Q_OBJECT	56	Q_OBJECT
44	57		57	Q_PROPERTY(MirSurfaceInterface* inputMethodSurface READ inputMethodSurface NOTIFY inputMethodSurfaceChanged)
45	58	public:	58	public:
46	59	explicit MirSurfaceManager(	59	explicit MirSurfaceManager(
47	60	const QSharedPointer<MirServer>& mirServer,	60	const QSharedPointer<MirServer>& mirServer,
48	@@ -66,7 +66,10 @@
49	66		66
50	67	static MirSurfaceManager* singleton();	67	static MirSurfaceManager* singleton();
51	68		68
52			69	MirSurfaceInterface* inputMethodSurface() const;
53			70
54	69	Q_SIGNALS:	71	Q_SIGNALS:
55			72	void inputMethodSurfaceChanged();
56	70	void surfaceCreated(MirSurfaceInterface* surface);	73	void surfaceCreated(MirSurfaceInterface* surface);
57	71	void surfaceDestroyed(MirSurfaceInterface* surface);	74	void surfaceDestroyed(MirSurfaceInterface* surface);
58	72		75
59	@@ -86,6 +89,7 @@
60	86	mir::shell::Shell *const m_shell;	89	mir::shell::Shell *const m_shell;
61	87	SessionManager* m_sessionManager;	90	SessionManager* m_sessionManager;
62	88	static MirSurfaceManager *instance;	91	static MirSurfaceManager *instance;
63			92	MirSurfaceInterface* m_inputMethodSurface = nullptr;
64	89	};	93	};
65	90		94
66	91	} // namespace qtmir	95	} // namespace qtmir