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

fixed merge

Browse Source
This commit is contained in:
krepa098 2014-10-01 17:03:59 +02:00
parent a159b80801
commit 8db22973e9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widget/chatareawidget.cpp
View File

@ -23,8 +23,9 @@
#include <QCoreApplication>
#include <QDebug>
ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
QTextBrowser(parent)
ChatAreaWidget::ChatAreaWidget(QWidget *parent)
: QTextBrowser(parent)
, nameWidth(75)
{
setReadOnly(true);
viewport()->setCursor(Qt::ArrowCursor);
@ -39,7 +40,7 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
QTextTableFormat tableFormat;
tableFormat.setCellSpacing(15);
tableFormat.setBorderStyle(QTextFrameFormat::BorderStyle_None);
tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::VariableLength,0),
tableFormat.setColumnWidthConstraints({QTextLength(QTextLength::FixedLength,nameWidth),
QTextLength(QTextLength::PercentageLength,100),
QTextLength(QTextLength::VariableLength,0)});
@ -50,7 +51,6 @@ ChatAreaWidget::ChatAreaWidget(QWidget *parent) :
dateFormat.setAlignment(Qt::AlignLeft);
dateFormat.setNonBreakableLines(true);
connect(this, &ChatAreaWidget::anchorClicked, this, &ChatAreaWidget::onAnchorClicked);
connect(verticalScrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(onSliderRangeChanged()));
}

4
widget/form/genericchatform.cpp
View File

@ -173,7 +173,9 @@ void GenericChatForm::addMessage(QString author, QString message, QDateTime date
if (previousName == author)
chatWidget->insertMessage(new MessageAction("", message, date, isMe));
else chatWidget->insertMessage(new MessageAction(getElidedName(author) , message, date, isMe));
else
chatWidget->insertMessage(new MessageAction(getElidedName(author) , message, date, isMe));
previousName = author;
}