1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr1076'

This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2015-01-31 23:06:06 +01:00
commit dc36bf379f
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -27,7 +27,7 @@ ChatTextEdit::ChatTextEdit(QWidget *parent) :
void ChatTextEdit::keyPressEvent(QKeyEvent * event) void ChatTextEdit::keyPressEvent(QKeyEvent * event)
{ {
int key = event->key(); int key = event->key();
if ((key == Qt::Key_Enter || key == Qt::Key_Return) && !(event->modifiers() && Qt::ShiftModifier)) if ((key == Qt::Key_Enter || key == Qt::Key_Return) && !(event->modifiers() & Qt::ShiftModifier))
emit enterPressed(); emit enterPressed();
else if (key == Qt::Key_Tab) else if (key == Qt::Key_Tab)
emit tabPressed(); emit tabPressed();