Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Swift/QtUI/QtChatWindow.cpp2
-rw-r--r--Swift/QtUI/QtChatWindow.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index ffcbf15..3818991 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -49,6 +49,7 @@
49 49
50#include <Swift/QtUI/QtAddBookmarkWindow.h> 50#include <Swift/QtUI/QtAddBookmarkWindow.h>
51#include <Swift/QtUI/QtEditBookmarkWindow.h> 51#include <Swift/QtUI/QtEditBookmarkWindow.h>
52#include <Swift/QtUI/QtEmoticonsGrid.h>
52#include <Swift/QtUI/QtPlainChatView.h> 53#include <Swift/QtUI/QtPlainChatView.h>
53#include <Swift/QtUI/QtScaledAvatarCache.h> 54#include <Swift/QtUI/QtScaledAvatarCache.h>
54#include <Swift/QtUI/QtSettingsProvider.h> 55#include <Swift/QtUI/QtSettingsProvider.h>
@@ -645,6 +646,7 @@ void QtChatWindow::handleEmoticonsButtonClicked() {
645 646
646void QtChatWindow::handleEmoticonClicked(QString emoticonAsText) { 647void QtChatWindow::handleEmoticonClicked(QString emoticonAsText) {
647 input_->textCursor().insertText(emoticonAsText); 648 input_->textCursor().insertText(emoticonAsText);
649 input_->setFocus();
648} 650}
649 651
650void QtChatWindow::handleTextInputReceivedFocus() { 652void QtChatWindow::handleTextInputReceivedFocus() {
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index 19046c9..8d7db59 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -20,7 +20,6 @@
20 20
21#include <Swift/QtUI/ChatSnippet.h> 21#include <Swift/QtUI/ChatSnippet.h>
22#include <Swift/QtUI/QtAffiliationEditor.h> 22#include <Swift/QtUI/QtAffiliationEditor.h>
23#include <Swift/QtUI/QtEmoticonsGrid.h>
24#include <Swift/QtUI/QtMUCConfigurationWindow.h> 23#include <Swift/QtUI/QtMUCConfigurationWindow.h>
25#include <Swift/QtUI/QtSwiftUtil.h> 24#include <Swift/QtUI/QtSwiftUtil.h>
26#include <Swift/QtUI/QtTabbable.h> 25#include <Swift/QtUI/QtTabbable.h>
@@ -41,6 +40,7 @@ namespace Swift {
41 class UIEventStream; 40 class UIEventStream;
42 class QtChatWindowJSBridge; 41 class QtChatWindowJSBridge;
43 class SettingsProvider; 42 class SettingsProvider;
43 class QtEmoticonsGrid;
44 44
45 class LabelModel : public QAbstractListModel { 45 class LabelModel : public QAbstractListModel {
46 Q_OBJECT 46 Q_OBJECT