Diffstat (limited to 'inputmethods/handwriting/qimpencombining.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/handwriting/qimpencombining.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inputmethods/handwriting/qimpencombining.cpp b/inputmethods/handwriting/qimpencombining.cpp index 30459e7..2e01ac2 100644 --- a/inputmethods/handwriting/qimpencombining.cpp +++ b/inputmethods/handwriting/qimpencombining.cpp @@ -43,64 +43,65 @@ static unsigned int combiningChars[][7] = { { 0, 0, 0, 0, 0, 0, 0 } }; QIMPenCombining::QIMPenCombining() { } QIMPenCombining::QIMPenCombining( const QString &fn ) : QIMPenCharSet( fn ) { } void QIMPenCombining::addCombined( QIMPenCharSet *cs ) { unsigned int count = cs->count(); QIMPenCharIterator it( cs->characters() ); for ( ; it.current() && count; ++it, --count ) { QIMPenChar *pc = it.current(); if ( pc->testFlag( QIMPenChar::Deleted ) ) continue; int charIdx = findCombining( pc->character() ); if ( charIdx < 0 ) continue; for ( int i = 0; i < 6; i++ ) { if ( combiningChars[charIdx][i+1] ) { QIMPenCharIterator cit( chars ); for ( ; cit.current(); ++cit ) { QIMPenChar *accentPc = cit.current(); if ( accentPc->character() == combiningSymbols[i] ) { QIMPenChar *combined = combine( pc, accentPc ); combined->setCharacter( combiningChars[charIdx][i+1] ); + combined->setFlag( QIMPenChar::Combined ); cs->addChar( combined ); } } } } } } int QIMPenCombining::findCombining( unsigned int ch ) const { int i = 0; while ( combiningChars[i][0] ) { if ( combiningChars[i][0] == ch ) return i; i++; } return -1; } QIMPenChar *QIMPenCombining::combine( QIMPenChar *base, QIMPenChar *accent ) { QRect brect = base->boundingRect(); QRect arect = accent->boundingRect(); int offset; if ( accent->testFlag( QIMPenChar::CombineRight ) ) offset = brect.left() - arect.left() + brect.width() + 2; else offset = brect.left() - arect.left() + (brect.width() - arect.width())/2; QIMPenChar *combined = 0; if ( base->character() == 'i' ) { // Hack to remove the dot from i's when combining. |