git.iko.soy/unity8
on xenial help sign in
Clean up Unity.Application mocks regarging input method
commitd43eea34275462ff7776fe0e85ac1b2f4b480cae authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateWed 11 Mar 2015, 19:50 (12 years ago) parent9b0b65d
5 files changed+19−66
compare with xenial
unifiedsplit
tests/mocks/Unity/Application/GenericApp.cpp−24 tests/mocks/Unity/Application/GenericApp.h−18 tests/mocks/Unity/Application/SurfaceManager.cpp−20 tests/mocks/Unity/Application/SurfaceManager.h−4 tests/qmltests/tst_OrientedShell.qml+19
tests/mocks/Unity/Application/GenericApp.cpp−24
@@ -32,42 +32,18 @@ GenericApp::GenericApp(const QString& name,
3232 : MirSurfaceItem(name, type, state, screenshot, qmlFilePath, parent)
3333 , m_touchPressCount(0)
3434 , m_touchReleaseCount(0)
35− , m_requestedInputMethod(false)
3635{
37− connect(this, &QQuickItem::activeFocusChanged,
38− this, &GenericApp::onActiveFocusChanged);
3936}
4037
4138GenericApp::~GenericApp()
4239{
4340}
4441
45−void GenericApp::onActiveFocusChanged()
46−{
47− if (hasActiveFocus()) {
48− if (m_requestedInputMethod) {
49− Q_EMIT inputMethodRequested();
50− }
51− } else {
52− Q_EMIT inputMethodDismissed();
53− }
54−}
55−
5642void GenericApp::touchEvent(QTouchEvent * event)
5743{
5844 if (event->touchPointStates() & Qt::TouchPointPressed) {
5945 ++m_touchPressCount;
6046 Q_EMIT touchPressCountChanged(m_touchPressCount);
61−
62− if (hasActiveFocus()) {
63− if (m_requestedInputMethod) {
64− Q_EMIT inputMethodDismissed();
65− } else {
66− Q_EMIT inputMethodRequested();
67− }
68− m_requestedInputMethod = !m_requestedInputMethod;
69− }
70−
7147 } else if (event->touchPointStates() & Qt::TouchPointReleased) {
7248 ++m_touchReleaseCount;
7349 Q_EMIT touchReleaseCountChanged(m_touchReleaseCount);
tests/mocks/Unity/Application/GenericApp.h−18
@@ -44,18 +44,9 @@ Q_SIGNALS:
4444 void touchPressCountChanged(int count);
4545 void touchReleaseCountChanged(int count);
4646
47− void inputMethodRequested();
48− void inputMethodDismissed();
49−
50− // internal mock use
51− void deregister();
52−
5347protected:
5448 void touchEvent(QTouchEvent * event) override;
5549
56−private Q_SLOTS:
57− void onActiveFocusChanged();
58−
5950private:
6051 explicit GenericApp(const QString& name,
6152 Type type,
@@ -64,18 +55,9 @@ private:
6455 const QString &qmlFilePath = QString(),
6556 QQuickItem *parent = 0);
6657
67− void createQmlContentItem();
68− void printComponentErrors();
69−
7058 int m_touchPressCount;
7159 int m_touchReleaseCount;
7260
73− QQmlComponent *m_qmlContentComponent;
74− QQuickItem *m_qmlItem;
75− QUrl m_screenshotUrl;
76−
77− bool m_requestedInputMethod;
78−
7961 friend class SurfaceManager;
8062};
8163
tests/mocks/Unity/Application/SurfaceManager.cpp−20
@@ -59,26 +59,6 @@ void SurfaceManager::registerSurface(MirSurfaceItem *surface)
5959 surface->setLive(false);
6060 Q_EMIT surfaceDestroyed(surface);
6161 });
62−
63− GenericApp *genericApp = qobject_cast<GenericApp*>(surface);
64− if (genericApp) {
65− connect(genericApp, &GenericApp::inputMethodRequested,
66− this, &SurfaceManager::showInputMethod, Qt::QueuedConnection);
67− connect(genericApp, &GenericApp::inputMethodDismissed,
68− this, &SurfaceManager::hideInputMethod, Qt::QueuedConnection);
69− }
70−}
71−
72−void SurfaceManager::showInputMethod()
73−{
74− inputMethodSurface()->setState(MirSurfaceItem::Restored);
75−}
76−
77−void SurfaceManager::hideInputMethod()
78−{
79− if (m_virtualKeyboard) {
80− m_virtualKeyboard->setState(MirSurfaceItem::Minimized);
81− }
8262}
8363
8464MirSurfaceItem *SurfaceManager::inputMethodSurface()
tests/mocks/Unity/Application/SurfaceManager.h−4
@@ -46,10 +46,6 @@ Q_SIGNALS:
4646 void surfaceCreated(MirSurfaceItem *surface);
4747 void surfaceDestroyed(MirSurfaceItem *surface);
4848
49−private Q_SLOTS:
50− void showInputMethod();
51− void hideInputMethod();
52−
5349private:
5450 static SurfaceManager *the_surface_manager;
5551 VirtualKeyboard *m_virtualKeyboard;
tests/qmltests/tst_OrientedShell.qml+19
@@ -262,6 +262,25 @@ Rectangle {
262262 app.fullscreen = !app.fullscreen;
263263 }
264264 }
265+ RowLayout {
266+ Layout.fillWidth: true
267+ CheckBox {
268+ checked: false
269+ activeFocusOnPress: false
270+ onCheckedChanged: {
271+ var surface = SurfaceManager.inputMethodSurface();
272+ if (checked) {
273+ surface.setState(MirSurfaceItem.Restored);
274+ } else {
275+ surface.setState(MirSurfaceItem.Minimized);
276+ }
277+ }
278+ }
279+ Label {
280+ text: "Input Method"
281+ anchors.verticalCenter: parent.verticalCenter
282+ }
283+ }
265284 }
266285 }
267286