From 7c367b73e68809c448c2c5b5f68c769723df0d4f Mon Sep 17 00:00:00 2001 From: Cranken Date: Sun, 30 Sep 2018 20:02:07 +0200 Subject: [PATCH] Changed some formatting, also fixed an unrelated bug. --- src/messages/MessageElement.cpp | 3 ++- src/messages/layouts/MessageLayoutContainer.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/messages/MessageElement.cpp b/src/messages/MessageElement.cpp index 434b944a..a000e0a8 100644 --- a/src/messages/MessageElement.cpp +++ b/src/messages/MessageElement.cpp @@ -162,8 +162,9 @@ void TextElement::addToContainer(MessageLayoutContainer &container, auto e = (new TextLayoutElement( *this, text, QSize(width, metrics.height()), color, this->style_, container.getScale())) - ->setText(text); + ->setLink(this->getLink()); e->setTrailingSpace(trailingSpace); + e->setText(text); // If URL link was changed, // Should update it in MessageLayoutElement too! diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp index 0aef73c6..bdd161e6 100644 --- a/src/messages/layouts/MessageLayoutContainer.cpp +++ b/src/messages/layouts/MessageLayoutContainer.cpp @@ -321,7 +321,7 @@ void MessageLayoutContainer::paintSelection(QPainter &painter, int messageIndex, int x = this->elements_[line.startIndex]->getRect().left(); int r = this->elements_[line.endIndex - 1]->getRect().right(); - if (line.endCharIndex < selection.selectionMin.charIndex) { + if (line.endCharIndex <= selection.selectionMin.charIndex) { continue; }