AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed QLineEdit to emit selectionChanged

Browse Source 
Was not emitted when removed by input method event.

Change-Id: Ia2c0dcb09d42826188d4612f4c1705a41874a31d
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
This commit is contained in:
Pekka Vuorela 2012-03-21 16:23:33 +02:00 committed by Qt by Nokia
parent b188221fee
commit 337eedb316
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/widgets/qwidgetlinecontrol.cpp
View File

@ -552,6 +552,8 @@ void QWidgetLineControl::processInputMethodEvent(QInputMethodEvent *event)
} }
selectionChange = true; selectionChange = true;
} else { } else {
if (m_selstart != m_selend)
selectionChange = true;
m_selstart = m_selend = 0; m_selstart = m_selend = 0;
} }
cursorPositionChanged = true; cursorPositionChanged = true;

21
tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
View File

@ -3846,13 +3846,26 @@ void tst_QLineEdit::inputMethodSelection()
QCOMPARE(selectionSpy.count(), 1); QCOMPARE(selectionSpy.count(), 1);
QCOMPARE(testWidget->selectionStart(), 0); QCOMPARE(testWidget->selectionStart(), 0);
QList<QInputMethodEvent::Attribute> attributes; // selection gained
attributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 12, 5, QVariant()); {
QInputMethodEvent event("", attributes); QList<QInputMethodEvent::Attribute> attributes;
QApplication::sendEvent(testWidget, &event); attributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 12, 5, QVariant());
QInputMethodEvent event("", attributes);
QApplication::sendEvent(testWidget, &event);
}
QCOMPARE(selectionSpy.count(), 2); QCOMPARE(selectionSpy.count(), 2);
QCOMPARE(testWidget->selectionStart(), 12); QCOMPARE(testWidget->selectionStart(), 12);
// selection removed
{
QList<QInputMethodEvent::Attribute> attributes;
attributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 0, 0, QVariant());
QInputMethodEvent event("", attributes);
QApplication::sendEvent(testWidget, &event);
}
QCOMPARE(selectionSpy.count(), 3);
} }
void tst_QLineEdit::inputMethodTentativeCommit() void tst_QLineEdit::inputMethodTentativeCommit()