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

Merge branch 'pr978'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2015-01-04 15:07:36 +01:00
commit 10a2213e66
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widget/chatareawidget.cpp
View File

@ -65,7 +65,7 @@ void ChatAreaWidget::mouseReleaseEvent(QMouseEvent * event)
QTextCursor cursor(document());
cursor.setPosition(pos);
if(!cursor.atEnd())
if (!cursor.atEnd())
{
cursor.setPosition(pos+1);

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

@ -255,7 +255,8 @@ void GenericChatForm::onEmoteButtonClicked()
void GenericChatForm::onChatWidgetClicked()
{
msgEdit->setFocus();
if (!chatWidget->textCursor().hasSelection())
msgEdit->setFocus();
}
void GenericChatForm::onEmoteInsertRequested(QString str)