Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 04:24:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update username in chat to use correct line height

Browse source
This commit is contained in:
Ryan Huffman 2014-04-16 10:02:54 -07:00
parent cb1408d26d
commit 8aee81ae7c
3 changed files with 50 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/ui/ChatMessageArea.cpp
View file

@ -9,11 +9,12 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include "Application.h"
#include "ChatMessageArea.h"
#include <QAbstractTextDocumentLayout>
#include <QWheelEvent>
ChatMessageArea::ChatMessageArea() : QTextBrowser() {
ChatMessageArea::ChatMessageArea(bool useFixedHeight) : QTextBrowser(), _useFixedHeight(useFixedHeight) {
connect(document()->documentLayout(), &QAbstractTextDocumentLayout::documentSizeChanged,
this, &ChatMessageArea::updateLayout);
}
@ -34,7 +35,15 @@ void ChatMessageArea::setHtml(const QString& html) {
}
void ChatMessageArea::updateLayout() {
setFixedHeight(document()->size().height());
if (_useFixedHeight) {
setFixedHeight(document()->size().height());
updateGeometry();
emit sizeChanged(size());
}
}
void ChatMessageArea::setSize(const QSize& size) {
setFixedHeight(size.height());
updateGeometry();
}

7
interface/src/ui/ChatMessageArea.h
View file

@ -19,14 +19,19 @@ const int CHAT_MESSAGE_LINE_HEIGHT = 130;
class ChatMessageArea : public QTextBrowser {
Q_OBJECT
public:
ChatMessageArea();
ChatMessageArea(bool useFixedHeight = true);
virtual void setHtml(const QString& html);
public slots:
void updateLayout();
void setSize(const QSize& size);
signals:
void sizeChanged(QSize newSize);
protected:
virtual void wheelEvent(QWheelEvent* event);
bool _useFixedHeight;
};

40
interface/src/ui/ChatWindow.cpp
View file

@ -240,13 +240,32 @@ void ChatWindow::messageReceived(const QXmppMessage& message) {
return;
}
QLabel* userLabel = new QLabel(getParticipantName(message.from()));
userLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
userLabel->setStyleSheet("padding: 2px; font-weight: bold");
userLabel->setAlignment(Qt::AlignTop | Qt::AlignRight);
// Create username label
ChatMessageArea* userLabel = new ChatMessageArea(false);
userLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
userLabel->setWordWrapMode(QTextOption::NoWrap);
userLabel->setLineWrapMode(QTextEdit::NoWrap);
userLabel->setTextInteractionFlags(Qt::NoTextInteraction);
userLabel->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
userLabel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
userLabel->setReadOnly(true);
userLabel->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
ChatMessageArea* messageArea = new ChatMessageArea();
userLabel->setStyleSheet("padding: 2px;"
"font-weight: bold;"
"background-color: rgba(0, 0, 0, 0%);"
"border: 0;");
QTextBlockFormat format;
format.setLineHeight(130, QTextBlockFormat::ProportionalHeight);
QTextCursor cursor = userLabel->textCursor();
cursor.setBlockFormat(format);
cursor.insertText(getParticipantName(message.from()));
userLabel->setAlignment(Qt::AlignRight);
// Create message area
ChatMessageArea* messageArea = new ChatMessageArea(true);
messageArea->setOpenLinks(true);
messageArea->setOpenExternalLinks(true);
messageArea->setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
@ -262,10 +281,11 @@ void ChatWindow::messageReceived(const QXmppMessage& message) {
"background-color: rgba(0, 0, 0, 0%);"
"border: 0;");
// Update background if this is a message from the current user
bool fromSelf = getParticipantName(message.from()) == AccountManager::getInstance().getUsername();
if (fromSelf) {
userLabel->setStyleSheet(userLabel->styleSheet() + "; background-color: #e1e8ea");
messageArea->setStyleSheet(messageArea->styleSheet() + "; background-color: #e1e8ea");
userLabel->setStyleSheet(userLabel->styleSheet() + "background-color: #e1e8ea");
messageArea->setStyleSheet(messageArea->styleSheet() + "background-color: #e1e8ea");
}
messageArea->setHtml(message.body().replace(regexLinks, "<a href=\"\\1\">\\1</a>"));
@ -274,6 +294,12 @@ void ChatWindow::messageReceived(const QXmppMessage& message) {
ui->messagesGridLayout->addWidget(userLabel, ui->messagesGridLayout->rowCount(), 0);
ui->messagesGridLayout->addWidget(messageArea, ui->messagesGridLayout->rowCount() - 1, 1);
// Force the height of the username area to match the height of the message area
connect(messageArea, &ChatMessageArea::sizeChanged, userLabel, &ChatMessageArea::setSize);
// Force initial height to match message area
userLabel->setFixedHeight(messageArea->size().height());
ui->messagesGridLayout->parentWidget()->updateGeometry();
Application::processEvents();