← Back to branch summary

~michael-sheldon/ubuntu-keyboard/fix-1385518-rtm

« back to all changes in this revision

Viewing changes to src/plugin/inputmethod.cpp

  • Committer: CI bot
  • Author(s): Michael Sheldon
  • Date: 2014-09-10 14:57:01 UTC
  • mfrom: (215.3.9 fix-1359404)
  • Revision ID: ps-jenkins@lists.canonical.com-20140910145701-j2o8iqkw4qtf4viw
Only switch back automatically from the symbol page if the user presses space or apostrophe and make pre-edit behaviour when entering symbols more consistent. Fixes: 1359404

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugin/inputmethod.cpp
102
102
 
103
103
    connect(this, SIGNAL(contentTypeChanged(TextContentType)), this, SLOT(setContentType(TextContentType)));
104
104
    connect(this, SIGNAL(activeLanguageChanged(QString)), d->editor.wordEngine(), SLOT(onLanguageChanged(QString)));
 
105
    connect(this, SIGNAL(keyboardStateChanged(QString)), &d->editor, SLOT(onKeyboardStateChanged(QString)));
105
106
    connect(d->m_geometry, SIGNAL(visibleRectChanged()), this, SLOT(onVisibleRectChanged()));
106
107
    d->registerAudioFeedbackSoundSetting();
107
108
    d->registerAudioFeedbackSetting();
162
163
    Q_D(InputMethod);
163
164
    d->editor.clearPreedit();
164
165
    d->previous_position = -1;
 
166
    Q_EMIT keyboardReset(); 
165
167
}
166
168
 
167
169
void InputMethod::setPreedit(const QString &preedit,
506
508
    Q_EMIT activeLanguageChanged(d->activeLanguage);
507
509
}
508
510
 
 
511
const QString InputMethod::keyboardState() const
 
512
{
 
513
    Q_D(const InputMethod);
 
514
    return d->keyboardState;
 
515
}
 
516
 
 
517
void InputMethod::setKeyboardState(const QString &state)
 
518
{
 
519
    Q_D(InputMethod);
 
520
    d->keyboardState = state;
 
521
    Q_EMIT keyboardStateChanged(d->keyboardState);
 
522
}
 
523
 
509
524
void InputMethod::onVisibleRectChanged()
510
525
{
511
526
    Q_D(InputMethod);