From 951d5004e121947b4379ccd951368a5b85046d48 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 23 Apr 2014 11:57:43 -0700 Subject: [PATCH] Add ChatInputArea with custom paste --- interface/src/ui/ChatMessageArea.h | 4 ++++ interface/ui/chatWindow.ui | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/interface/src/ui/ChatMessageArea.h b/interface/src/ui/ChatMessageArea.h index 48cfc01aec..b726a31d76 100644 --- a/interface/src/ui/ChatMessageArea.h +++ b/interface/src/ui/ChatMessageArea.h @@ -33,6 +33,10 @@ protected: virtual void wheelEvent(QWheelEvent* event); bool _useFixedHeight; + void insertFromMimeData(const QMimeData* source) { + insertPlainText(source->text()); + }; + }; #endif // hifi_ChatMessageArea_h diff --git a/interface/ui/chatWindow.ui b/interface/ui/chatWindow.ui index d63542bf7b..28aa6a2390 100644 --- a/interface/ui/chatWindow.ui +++ b/interface/ui/chatWindow.ui @@ -186,7 +186,7 @@ QPushButton:pressed { - + 0 @@ -223,6 +223,13 @@ QPushButton:pressed { + + + ChatInputArea + QTextEdit +
ui/ChatInputArea.h
+
+
messagePlainTextEdit messagesScrollArea