From 795ddbc7bf9d9b4cda49c89a2e37ff2dca56fb87 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 17 Apr 2014 15:19:13 -0700 Subject: [PATCH] Update ChatMessageArea to open urls via Menu::openUrl --- interface/src/ui/ChatMessageArea.cpp | 4 ++++ interface/src/ui/ChatWindow.cpp | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/ChatMessageArea.cpp b/interface/src/ui/ChatMessageArea.cpp index 929ad85d87..1e16a8a2db 100644 --- a/interface/src/ui/ChatMessageArea.cpp +++ b/interface/src/ui/ChatMessageArea.cpp @@ -15,8 +15,12 @@ #include ChatMessageArea::ChatMessageArea(bool useFixedHeight) : QTextBrowser(), _useFixedHeight(useFixedHeight) { + setOpenLinks(false); + connect(document()->documentLayout(), &QAbstractTextDocumentLayout::documentSizeChanged, this, &ChatMessageArea::updateLayout); + connect(this, &QTextBrowser::anchorClicked, + Menu::getInstance(), &Menu::openUrl); } void ChatMessageArea::setHtml(const QString& html) { diff --git a/interface/src/ui/ChatWindow.cpp b/interface/src/ui/ChatWindow.cpp index ad59222202..e1ee30b4b9 100644 --- a/interface/src/ui/ChatWindow.cpp +++ b/interface/src/ui/ChatWindow.cpp @@ -255,8 +255,6 @@ void ChatWindow::messageReceived(const QXmppMessage& message) { // Create message area ChatMessageArea* messageArea = new ChatMessageArea(true); - messageArea->setOpenLinks(true); - messageArea->setOpenExternalLinks(true); messageArea->setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); messageArea->setTextInteractionFlags(Qt::TextBrowserInteraction); messageArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);