StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(chatform): include pressed key(s) when changing focus

Browse Source 
Instead of just giving focus, give focus and add the key that was pressed. Also change from KeyRelease to KeyPress to avoid missing the second key pressed in the case of the second key being pressed before the first is released.
This commit is contained in:
Anthony Bilinski 2018-04-04 17:42:06 -07:00
parent 65d59ba6b7
commit a8fc6e5c6b
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widget/form/genericchatform.cpp
View File

@ -311,13 +311,15 @@ void GenericChatForm::showEvent(QShowEvent*)
bool GenericChatForm::event(QEvent* e)
{
// If the user accidentally starts typing outside of the msgEdit, focus it automatically
if (e->type() == QEvent::KeyRelease && !msgEdit->hasFocus()) {
if (e->type() == QEvent::KeyPress) {
QKeyEvent* ke = static_cast<QKeyEvent*>(e);
if ((ke->modifiers() == Qt::NoModifier || ke->modifiers() == Qt::ShiftModifier)
&& !ke->text().isEmpty()) {
if (searchForm->isHidden()) {
msgEdit->sendKeyEvent(ke);
msgEdit->setFocus();
} else {
searchForm->insertEditor(ke->text());
searchForm->setFocusEditor();
}
}

5
src/widget/searchform.cpp
View File

@ -65,6 +65,11 @@ void SearchForm::setFocusEditor()
searchLine->setFocus();
}
void SearchForm::insertEditor(const QString &text)
{
searchLine->insert(text);
}
void SearchForm::showEvent(QShowEvent* event)
{
QWidget::showEvent(event);

1
src/widget/searchform.h
View File

@ -34,6 +34,7 @@ public:
void removeSearchPhrase();
QString getSearchPhrase() const;
void setFocusEditor();
void insertEditor(const QString &text);
protected:
virtual void showEvent(QShowEvent* event) final override;