qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QQuickTextInput: Remove redundant centerPoint calculations. 

The default is to press/release in the center of the window, so we don't need to
DIY.

Change-Id: Id65b2b54c15d45e8d780a008d05275718f519a71
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Robin Burchell 2016-05-13 17:50:05 +02:00
parent 4b4cf31c7a
commit 064dc6a29b
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
View File

@ -3409,16 +3409,15 @@ void tst_qquicktextinput::focusOnPress()
QCOMPARE(textInputObject->hasFocus(), false); QCOMPARE(textInputObject->hasFocus(), false);
QCOMPARE(textInputObject->hasActiveFocus(), false); QCOMPARE(textInputObject->hasActiveFocus(), false);
QPoint centerPoint(window.width()/2, window.height()/2);
Qt::KeyboardModifiers noModifiers = 0; Qt::KeyboardModifiers noModifiers = 0;
QTest::mousePress(&window, Qt::LeftButton, noModifiers, centerPoint); QTest::mousePress(&window, Qt::LeftButton, noModifiers);
QGuiApplication::processEvents(); QGuiApplication::processEvents();
QCOMPARE(textInputObject->hasFocus(), true); QCOMPARE(textInputObject->hasFocus(), true);
QCOMPARE(textInputObject->hasActiveFocus(), true); QCOMPARE(textInputObject->hasActiveFocus(), true);
QCOMPARE(focusSpy.count(), 1); QCOMPARE(focusSpy.count(), 1);
QCOMPARE(activeFocusSpy.count(), 1); QCOMPARE(activeFocusSpy.count(), 1);
QCOMPARE(textInputObject->selectedText(), QString()); QCOMPARE(textInputObject->selectedText(), QString());
QTest::mouseRelease(&window, Qt::LeftButton, noModifiers, centerPoint); QTest::mouseRelease(&window, Qt::LeftButton, noModifiers);
textInputObject->setFocusOnPress(false); textInputObject->setFocusOnPress(false);
QCOMPARE(textInputObject->focusOnPress(), false); QCOMPARE(textInputObject->focusOnPress(), false);
@ -3432,13 +3431,13 @@ void tst_qquicktextinput::focusOnPress()
// Wait for double click timeout to expire before clicking again. // Wait for double click timeout to expire before clicking again.
QTest::qWait(400); QTest::qWait(400);
QTest::mousePress(&window, Qt::LeftButton, noModifiers, centerPoint); QTest::mousePress(&window, Qt::LeftButton, noModifiers);
QGuiApplication::processEvents(); QGuiApplication::processEvents();
QCOMPARE(textInputObject->hasFocus(), false); QCOMPARE(textInputObject->hasFocus(), false);
QCOMPARE(textInputObject->hasActiveFocus(), false); QCOMPARE(textInputObject->hasActiveFocus(), false);
QCOMPARE(focusSpy.count(), 2); QCOMPARE(focusSpy.count(), 2);
QCOMPARE(activeFocusSpy.count(), 2); QCOMPARE(activeFocusSpy.count(), 2);
QTest::mouseRelease(&window, Qt::LeftButton, noModifiers, centerPoint); QTest::mouseRelease(&window, Qt::LeftButton, noModifiers);
textInputObject->setFocusOnPress(true); textInputObject->setFocusOnPress(true);
QCOMPARE(textInputObject->focusOnPress(), true); QCOMPARE(textInputObject->focusOnPress(), true);
@ -3448,14 +3447,14 @@ void tst_qquicktextinput::focusOnPress()
textInputObject->setProperty("selectOnFocus", true); textInputObject->setProperty("selectOnFocus", true);
QTest::qWait(400); QTest::qWait(400);
QTest::mousePress(&window, Qt::LeftButton, noModifiers, centerPoint); QTest::mousePress(&window, Qt::LeftButton, noModifiers);
QGuiApplication::processEvents(); QGuiApplication::processEvents();
QCOMPARE(textInputObject->hasFocus(), true); QCOMPARE(textInputObject->hasFocus(), true);
QCOMPARE(textInputObject->hasActiveFocus(), true); QCOMPARE(textInputObject->hasActiveFocus(), true);
QCOMPARE(focusSpy.count(), 3); QCOMPARE(focusSpy.count(), 3);
QCOMPARE(activeFocusSpy.count(), 3); QCOMPARE(activeFocusSpy.count(), 3);
QCOMPARE(textInputObject->selectedText(), textInputObject->text()); QCOMPARE(textInputObject->selectedText(), textInputObject->text());
QTest::mouseRelease(&window, Qt::LeftButton, noModifiers, centerPoint); QTest::mouseRelease(&window, Qt::LeftButton, noModifiers);
} }
void tst_qquicktextinput::openInputPanel() void tst_qquicktextinput::openInputPanel()
@ -3479,23 +3478,22 @@ void tst_qquicktextinput::openInputPanel()
QCOMPARE(qApp->inputMethod()->isVisible(), false); QCOMPARE(qApp->inputMethod()->isVisible(), false);
// input panel should open on focus // input panel should open on focus
QPoint centerPoint(view.width()/2, view.height()/2);
Qt::KeyboardModifiers noModifiers = 0; Qt::KeyboardModifiers noModifiers = 0;
QTest::mousePress(&view, Qt::LeftButton, noModifiers, centerPoint); QTest::mousePress(&view, Qt::LeftButton, noModifiers);
QGuiApplication::processEvents(); QGuiApplication::processEvents();
QVERIFY(input->hasActiveFocus()); QVERIFY(input->hasActiveFocus());
QCOMPARE(qApp->focusObject(), input); QCOMPARE(qApp->focusObject(), input);
QCOMPARE(qApp->inputMethod()->isVisible(), true); QCOMPARE(qApp->inputMethod()->isVisible(), true);
QTest::mouseRelease(&view, Qt::LeftButton, noModifiers, centerPoint); QTest::mouseRelease(&view, Qt::LeftButton, noModifiers);
// input panel should be re-opened when pressing already focused TextInput // input panel should be re-opened when pressing already focused TextInput
qApp->inputMethod()->hide(); qApp->inputMethod()->hide();
QCOMPARE(qApp->inputMethod()->isVisible(), false); QCOMPARE(qApp->inputMethod()->isVisible(), false);
QVERIFY(input->hasActiveFocus()); QVERIFY(input->hasActiveFocus());
QTest::mousePress(&view, Qt::LeftButton, noModifiers, centerPoint); QTest::mousePress(&view, Qt::LeftButton, noModifiers);
QGuiApplication::processEvents(); QGuiApplication::processEvents();
QCOMPARE(qApp->inputMethod()->isVisible(), true); QCOMPARE(qApp->inputMethod()->isVisible(), true);
QTest::mouseRelease(&view, Qt::LeftButton, noModifiers, centerPoint); QTest::mouseRelease(&view, Qt::LeftButton, noModifiers);
// input panel should stay visible if focus is lost to another text inputor // input panel should stay visible if focus is lost to another text inputor
QSignalSpy inputPanelVisibilitySpy(qApp->inputMethod(), SIGNAL(visibleChanged())); QSignalSpy inputPanelVisibilitySpy(qApp->inputMethod(), SIGNAL(visibleChanged()));
@ -3518,8 +3516,8 @@ void tst_qquicktextinput::openInputPanel()
input->setReadOnly(true); input->setReadOnly(true);
input->setFocus(true); input->setFocus(true);
QCOMPARE(qApp->inputMethod()->isVisible(), false); QCOMPARE(qApp->inputMethod()->isVisible(), false);
QTest::mousePress(&view, Qt::LeftButton, noModifiers, centerPoint); QTest::mousePress(&view, Qt::LeftButton, noModifiers);
QTest::mouseRelease(&view, Qt::LeftButton, noModifiers, centerPoint); QTest::mouseRelease(&view, Qt::LeftButton, noModifiers);
QGuiApplication::processEvents(); QGuiApplication::processEvents();
QCOMPARE(qApp->inputMethod()->isVisible(), false); QCOMPARE(qApp->inputMethod()->isVisible(), false);
@ -3528,8 +3526,8 @@ void tst_qquicktextinput::openInputPanel()
input->setFocus(false); input->setFocus(false);
input->setFocus(true); input->setFocus(true);
QCOMPARE(qApp->inputMethod()->isVisible(), false); QCOMPARE(qApp->inputMethod()->isVisible(), false);
QTest::mousePress(&view, Qt::LeftButton, noModifiers, centerPoint); QTest::mousePress(&view, Qt::LeftButton, noModifiers);
QTest::mouseRelease(&view, Qt::LeftButton, noModifiers, centerPoint); QTest::mouseRelease(&view, Qt::LeftButton, noModifiers);
QCOMPARE(qApp->inputMethod()->isVisible(), false); QCOMPARE(qApp->inputMethod()->isVisible(), false);
} }