I BROKE EVERYTHING
refactored the rendering process
This commit is contained in:
fourtf
+282
-436
@@ -1,8 +1,8 @@
|
||||
#include "channelview.hpp"
|
||||
#include "debug/log.hpp"
|
||||
#include "messages/layouts/messagelayout.hpp"
|
||||
#include "messages/limitedqueuesnapshot.hpp"
|
||||
#include "messages/message.hpp"
|
||||
#include "messages/messageref.hpp"
|
||||
#include "singletons/channelmanager.hpp"
|
||||
#include "singletons/settingsmanager.hpp"
|
||||
#include "singletons/thememanager.hpp"
|
||||
@@ -57,8 +57,7 @@ ChannelView::ChannelView(BaseWidget *parent)
|
||||
|
||||
singletons::WindowManager &windowManager = singletons::WindowManager::getInstance();
|
||||
|
||||
this->repaintGifsConnection =
|
||||
windowManager.repaintGifs.connect([&] { this->updateGifEmotes(); });
|
||||
this->repaintGifsConnection = windowManager.repaintGifs.connect([&] { this->queueUpdate(); });
|
||||
this->layoutConnection = windowManager.layout.connect([&](Channel *channel) {
|
||||
if (channel == nullptr || this->channel.get() == channel) {
|
||||
this->layoutMessages();
|
||||
@@ -225,14 +224,6 @@ void ChannelView::clearMessages()
|
||||
this->queueUpdate();
|
||||
}
|
||||
|
||||
void ChannelView::updateGifEmotes()
|
||||
{
|
||||
if (!this->gifEmotes.empty()) {
|
||||
this->onlyUpdateEmotes = true;
|
||||
this->queueUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
Scrollbar &ChannelView::getScrollBar()
|
||||
{
|
||||
return this->scrollBar;
|
||||
@@ -240,103 +231,106 @@ Scrollbar &ChannelView::getScrollBar()
|
||||
|
||||
QString ChannelView::getSelectedText()
|
||||
{
|
||||
auto messagesSnapshot = this->getMessagesSnapshot();
|
||||
// fourtf: xD
|
||||
// auto messagesSnapshot = this->getMessagesSnapshot();
|
||||
|
||||
QString text;
|
||||
bool isSingleMessage = this->selection.isSingleMessage();
|
||||
// QString text;
|
||||
// bool isSingleMessage = this->selection.isSingleMessage();
|
||||
|
||||
size_t i = std::max(0, this->selection.min.messageIndex);
|
||||
// size_t i = std::max(0, this->selection.min.messageIndex);
|
||||
|
||||
int charIndex = 0;
|
||||
// int charIndex = 0;
|
||||
|
||||
bool first = true;
|
||||
// bool first = true;
|
||||
|
||||
auto addPart = [&](const WordPart &part, int from = 0, int to = -1) {
|
||||
if (part.getCopyText().isEmpty()) {
|
||||
return;
|
||||
}
|
||||
// auto addPart = [&](const MessageLayoutElement &part, int from = 0, int to = -1) {
|
||||
// if (part.getCopyText().isEmpty()) {
|
||||
// return;
|
||||
// }
|
||||
|
||||
if (part.getWord().isText()) {
|
||||
text += part.getText().mid(from, to);
|
||||
} else {
|
||||
text += part.getCopyText();
|
||||
}
|
||||
};
|
||||
// if (part.getWord().isText()) {
|
||||
// text += part.getText().mid(from, to);
|
||||
// } else {
|
||||
// text += part.getCopyText();
|
||||
// }
|
||||
// };
|
||||
|
||||
// first line
|
||||
for (const messages::WordPart &part : messagesSnapshot[i]->getWordParts()) {
|
||||
int charLength = part.getCharacterLength();
|
||||
// // first line
|
||||
// for (const messages::MessageLayoutElement &part : messagesSnapshot[i]->getWordParts()) {
|
||||
// int charLength = part.getCharacterLength();
|
||||
|
||||
if (charIndex + charLength < this->selection.min.charIndex) {
|
||||
charIndex += charLength;
|
||||
continue;
|
||||
}
|
||||
// if (charIndex + charLength < this->selection.min.charIndex) {
|
||||
// charIndex += charLength;
|
||||
// continue;
|
||||
// }
|
||||
|
||||
if (first) {
|
||||
first = false;
|
||||
bool isSingleWord =
|
||||
isSingleMessage &&
|
||||
this->selection.max.charIndex - charIndex < part.getCharacterLength();
|
||||
// if (first) {
|
||||
// first = false;
|
||||
// bool isSingleWord =
|
||||
// isSingleMessage &&
|
||||
// this->selection.max.charIndex - charIndex < part.getCharacterLength();
|
||||
|
||||
if (isSingleWord) {
|
||||
// return single word
|
||||
addPart(part, this->selection.min.charIndex - charIndex,
|
||||
this->selection.max.charIndex - this->selection.min.charIndex);
|
||||
return text;
|
||||
} else {
|
||||
// add first word of the selection
|
||||
addPart(part, this->selection.min.charIndex - charIndex);
|
||||
}
|
||||
} else if (isSingleMessage && charIndex + charLength >= selection.max.charIndex) {
|
||||
addPart(part, 0, this->selection.max.charIndex - charIndex);
|
||||
// if (isSingleWord) {
|
||||
// // return single word
|
||||
// addPart(part, this->selection.min.charIndex - charIndex,
|
||||
// this->selection.max.charIndex - this->selection.min.charIndex);
|
||||
// return text;
|
||||
// } else {
|
||||
// // add first word of the selection
|
||||
// addPart(part, this->selection.min.charIndex - charIndex);
|
||||
// }
|
||||
// } else if (isSingleMessage && charIndex + charLength >= selection.max.charIndex) {
|
||||
// addPart(part, 0, this->selection.max.charIndex - charIndex);
|
||||
|
||||
return text;
|
||||
} else {
|
||||
text += part.getCopyText() + (part.hasTrailingSpace() ? " " : "");
|
||||
}
|
||||
// return text;
|
||||
// } else {
|
||||
// text += part.getCopyText() + (part.hasTrailingSpace() ? " " : "");
|
||||
// }
|
||||
|
||||
charIndex += charLength;
|
||||
}
|
||||
// charIndex += charLength;
|
||||
// }
|
||||
|
||||
text += "\n";
|
||||
// text += "\n";
|
||||
|
||||
// middle lines
|
||||
for (i++; (int)i < this->selection.max.messageIndex; i++) {
|
||||
for (const messages::WordPart &part : messagesSnapshot[i]->getWordParts()) {
|
||||
if (!part.getCopyText().isEmpty()) {
|
||||
text += part.getCopyText();
|
||||
// // middle lines
|
||||
// for (i++; (int)i < this->selection.max.messageIndex; i++) {
|
||||
// for (const messages::MessageLayoutElement &part : messagesSnapshot[i]->getWordParts())
|
||||
// {
|
||||
// if (!part.getCopyText().isEmpty()) {
|
||||
// text += part.getCopyText();
|
||||
|
||||
if (part.hasTrailingSpace()) {
|
||||
text += " ";
|
||||
}
|
||||
}
|
||||
}
|
||||
text += "\n";
|
||||
}
|
||||
// if (part.hasTrailingSpace()) {
|
||||
// text += " ";
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// text += "\n";
|
||||
// }
|
||||
|
||||
// last line
|
||||
charIndex = 0;
|
||||
// // last line
|
||||
// charIndex = 0;
|
||||
|
||||
for (const messages::WordPart &part :
|
||||
messagesSnapshot[this->selection.max.messageIndex]->getWordParts()) {
|
||||
int charLength = part.getCharacterLength();
|
||||
// for (const messages::MessageLayoutElement &part :
|
||||
// messagesSnapshot[this->selection.max.messageIndex]->getWordParts()) {
|
||||
// int charLength = part.getCharacterLength();
|
||||
|
||||
if (charIndex + charLength >= this->selection.max.charIndex) {
|
||||
addPart(part, 0, this->selection.max.charIndex - charIndex);
|
||||
// if (charIndex + charLength >= this->selection.max.charIndex) {
|
||||
// addPart(part, 0, this->selection.max.charIndex - charIndex);
|
||||
|
||||
return text;
|
||||
}
|
||||
// return text;
|
||||
// }
|
||||
|
||||
text += part.getCopyText();
|
||||
// text += part.getCopyText();
|
||||
|
||||
if (part.hasTrailingSpace()) {
|
||||
text += " ";
|
||||
}
|
||||
// if (part.hasTrailingSpace()) {
|
||||
// text += " ";
|
||||
// }
|
||||
|
||||
charIndex += charLength;
|
||||
}
|
||||
// charIndex += charLength;
|
||||
// }
|
||||
|
||||
return text;
|
||||
// return text;
|
||||
return "";
|
||||
}
|
||||
|
||||
bool ChannelView::hasSelection()
|
||||
@@ -360,7 +354,7 @@ bool ChannelView::getEnableScrollingToBottom() const
|
||||
return this->enableScrollingToBottom;
|
||||
}
|
||||
|
||||
messages::LimitedQueueSnapshot<SharedMessageRef> ChannelView::getMessagesSnapshot()
|
||||
messages::LimitedQueueSnapshot<MessageLayoutPtr> ChannelView::getMessagesSnapshot()
|
||||
{
|
||||
if (!this->paused) {
|
||||
this->snapshot = this->messages.getSnapshot();
|
||||
@@ -369,7 +363,7 @@ messages::LimitedQueueSnapshot<SharedMessageRef> ChannelView::getMessagesSnapsho
|
||||
return this->snapshot;
|
||||
}
|
||||
|
||||
void ChannelView::setChannel(std::shared_ptr<Channel> newChannel)
|
||||
void ChannelView::setChannel(SharedChannel newChannel)
|
||||
{
|
||||
if (this->channel) {
|
||||
this->detachChannel();
|
||||
@@ -378,12 +372,12 @@ void ChannelView::setChannel(std::shared_ptr<Channel> newChannel)
|
||||
|
||||
// on new message
|
||||
this->messageAppendedConnection =
|
||||
newChannel->messageAppended.connect([this](SharedMessage &message) {
|
||||
SharedMessageRef deleted;
|
||||
newChannel->messageAppended.connect([this](MessagePtr &message) {
|
||||
MessageLayoutPtr deleted;
|
||||
|
||||
auto messageRef = new MessageRef(message);
|
||||
auto messageRef = new MessageLayout(message);
|
||||
|
||||
if (this->messages.pushBack(SharedMessageRef(messageRef), deleted)) {
|
||||
if (this->messages.pushBack(MessageLayoutPtr(messageRef), deleted)) {
|
||||
if (this->scrollBar.isAtBottom()) {
|
||||
this->scrollBar.scrollToBottom();
|
||||
} else {
|
||||
@@ -391,7 +385,7 @@ void ChannelView::setChannel(std::shared_ptr<Channel> newChannel)
|
||||
}
|
||||
}
|
||||
|
||||
if (message->containsHighlightedPhrase()) {
|
||||
if (!message->hasFlags(Message::DoNotTriggerNotification)) {
|
||||
this->highlightedMessageReceived.invoke();
|
||||
}
|
||||
|
||||
@@ -402,12 +396,12 @@ void ChannelView::setChannel(std::shared_ptr<Channel> newChannel)
|
||||
});
|
||||
|
||||
this->messageAddedAtStartConnection =
|
||||
newChannel->messagesAddedAtStart.connect([this](std::vector<SharedMessage> &messages) {
|
||||
std::vector<SharedMessageRef> messageRefs;
|
||||
newChannel->messagesAddedAtStart.connect([this](std::vector<MessagePtr> &messages) {
|
||||
std::vector<MessageLayoutPtr> messageRefs;
|
||||
messageRefs.resize(messages.size());
|
||||
qDebug() << messages.size();
|
||||
for (int i = 0; i < messages.size(); i++) {
|
||||
messageRefs.at(i) = SharedMessageRef(new MessageRef(messages.at(i)));
|
||||
for (size_t i = 0; i < messages.size(); i++) {
|
||||
messageRefs.at(i) = MessageLayoutPtr(new MessageLayout(messages.at(i)));
|
||||
}
|
||||
|
||||
if (this->messages.pushFront(messageRefs).size() > 0) {
|
||||
@@ -420,7 +414,7 @@ void ChannelView::setChannel(std::shared_ptr<Channel> newChannel)
|
||||
|
||||
std::vector<ScrollbarHighlight> highlights;
|
||||
highlights.reserve(messages.size());
|
||||
for (int i = 0; i < messages.size(); i++) {
|
||||
for (size_t i = 0; i < messages.size(); i++) {
|
||||
highlights.push_back(messages.at(i)->getScrollBarHighlight());
|
||||
}
|
||||
|
||||
@@ -432,7 +426,7 @@ void ChannelView::setChannel(std::shared_ptr<Channel> newChannel)
|
||||
|
||||
// on message removed
|
||||
this->messageRemovedConnection =
|
||||
newChannel->messageRemovedFromStart.connect([this](SharedMessage &) {
|
||||
newChannel->messageRemovedFromStart.connect([this](MessagePtr &) {
|
||||
this->selection.min.messageIndex--;
|
||||
this->selection.max.messageIndex--;
|
||||
this->selection.start.messageIndex--;
|
||||
@@ -443,8 +437,8 @@ void ChannelView::setChannel(std::shared_ptr<Channel> newChannel)
|
||||
|
||||
// on message replaced
|
||||
this->messageReplacedConnection =
|
||||
newChannel->messageReplaced.connect([this](size_t index, SharedMessage replacement) {
|
||||
SharedMessageRef newItem(new MessageRef(replacement));
|
||||
newChannel->messageReplaced.connect([this](size_t index, MessagePtr replacement) {
|
||||
MessageLayoutPtr newItem(new MessageLayout(replacement));
|
||||
|
||||
this->scrollBar.replaceHighlight(index, replacement->getScrollBarHighlight());
|
||||
|
||||
@@ -455,11 +449,11 @@ void ChannelView::setChannel(std::shared_ptr<Channel> newChannel)
|
||||
auto snapshot = newChannel->getMessageSnapshot();
|
||||
|
||||
for (size_t i = 0; i < snapshot.getLength(); i++) {
|
||||
SharedMessageRef deleted;
|
||||
MessageLayoutPtr deleted;
|
||||
|
||||
auto messageRef = new MessageRef(snapshot[i]);
|
||||
auto messageRef = new MessageLayout(snapshot[i]);
|
||||
|
||||
this->messages.pushBack(SharedMessageRef(messageRef), deleted);
|
||||
this->messages.pushBack(MessageLayoutPtr(messageRef), deleted);
|
||||
}
|
||||
|
||||
this->channel = newChannel;
|
||||
@@ -513,47 +507,20 @@ void ChannelView::setSelection(const SelectionItem &start, const SelectionItem &
|
||||
void ChannelView::paintEvent(QPaintEvent * /*event*/)
|
||||
{
|
||||
// BENCH(timer);
|
||||
|
||||
QPainter painter(this);
|
||||
|
||||
// only update gif emotes
|
||||
#ifndef Q_OS_MACOS
|
||||
// if (this->onlyUpdateEmotes) {
|
||||
// this->onlyUpdateEmotes = false;
|
||||
|
||||
// for (const GifEmoteData &item : this->gifEmotes) {
|
||||
// painter.fillRect(item.rect, this->themeManager.ChatBackground);
|
||||
|
||||
// painter.drawPixmap(item.rect, *item.image->getPixmap());
|
||||
// }
|
||||
|
||||
// return;
|
||||
// }
|
||||
#endif
|
||||
|
||||
// update all messages
|
||||
this->gifEmotes.clear();
|
||||
|
||||
painter.fillRect(rect(), this->themeManager.splits.background);
|
||||
|
||||
// draw messages
|
||||
this->drawMessages(painter, false);
|
||||
|
||||
painter.setRenderHint(QPainter::SmoothPixmapTransform);
|
||||
|
||||
// draw gif emotes
|
||||
for (GifEmoteData &item : this->gifEmotes) {
|
||||
painter.drawPixmap(item.rect, *item.image->getPixmap());
|
||||
}
|
||||
|
||||
// draw the overlays of the messages (such as disabled message blur-out)
|
||||
this->drawMessages(painter, true);
|
||||
this->drawMessages(painter);
|
||||
|
||||
// MARK(timer);
|
||||
}
|
||||
|
||||
// if overlays is false then it draws the message, if true then it draws things such as the grey
|
||||
// overlay when a message is disabled
|
||||
void ChannelView::drawMessages(QPainter &painter, bool overlays)
|
||||
void ChannelView::drawMessages(QPainter &painter)
|
||||
{
|
||||
auto messagesSnapshot = this->getMessagesSnapshot();
|
||||
|
||||
@@ -566,83 +533,16 @@ void ChannelView::drawMessages(QPainter &painter, bool overlays)
|
||||
int y = -(messagesSnapshot[start].get()->getHeight() *
|
||||
(fmod(this->scrollBar.getCurrentValue(), 1)));
|
||||
|
||||
messages::MessageRef *end = nullptr;
|
||||
messages::MessageLayout *end = nullptr;
|
||||
|
||||
for (size_t i = start; i < messagesSnapshot.getLength(); ++i) {
|
||||
messages::MessageRef *messageRef = messagesSnapshot[i].get();
|
||||
messages::MessageLayout *layout = messagesSnapshot[i].get();
|
||||
|
||||
if (overlays) {
|
||||
if (messageRef->isDisabled()) {
|
||||
painter.fillRect(0, y, this->width(), messageRef->getHeight(),
|
||||
this->themeManager.messages.disabled);
|
||||
}
|
||||
} else {
|
||||
std::shared_ptr<QPixmap> buffer = messageRef->buffer;
|
||||
layout->paint(painter, y, i, this->selection);
|
||||
|
||||
// bool updateBuffer = messageRef->updateBuffer;
|
||||
bool updateBuffer = false;
|
||||
y += layout->getHeight();
|
||||
|
||||
if (!buffer) {
|
||||
QPixmap *pixmap;
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
|
||||
pixmap = new QPixmap(
|
||||
(int)(this->width() * painter.device()->devicePixelRatioF()),
|
||||
(int)(messageRef->getHeight() * painter.device()->devicePixelRatioF()));
|
||||
pixmap->setDevicePixelRatio(painter.device()->devicePixelRatioF());
|
||||
#else
|
||||
pixmap = new QPixmap(this->width(), messageRef->getHeight());
|
||||
#endif
|
||||
buffer = std::shared_ptr<QPixmap>(pixmap);
|
||||
updateBuffer = true;
|
||||
}
|
||||
|
||||
updateBuffer |= this->selecting;
|
||||
|
||||
// update messages that have been changed
|
||||
if (updateBuffer) {
|
||||
this->updateMessageBuffer(messageRef, buffer.get(), i);
|
||||
// qDebug() << "updating buffer xD";
|
||||
}
|
||||
|
||||
// get gif emotes
|
||||
for (messages::WordPart const &wordPart : messageRef->getWordParts()) {
|
||||
if (wordPart.getWord().isImage()) {
|
||||
messages::LazyLoadedImage &lli = wordPart.getWord().getImage();
|
||||
|
||||
if (lli.getAnimated()) {
|
||||
GifEmoteData gifEmoteData;
|
||||
gifEmoteData.image = &lli;
|
||||
QRect rect(wordPart.getX(), wordPart.getY() + y, wordPart.getWidth(),
|
||||
wordPart.getHeight());
|
||||
|
||||
gifEmoteData.rect = rect;
|
||||
|
||||
this->gifEmotes.push_back(gifEmoteData);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
messageRef->buffer = buffer;
|
||||
|
||||
if (buffer) {
|
||||
//#ifdef Q_OS_MACOS
|
||||
// painter.setRenderHint(QPainter::SmoothPixmapTransform, false);
|
||||
// painter.drawPixmap(0, y,
|
||||
|
||||
// (int)(buffer->width() / painter.device()->devicePixelRatioF()),
|
||||
// (int)(buffer->height() / painter.device()->devicePixelRatioF()),
|
||||
// *buffer.get());
|
||||
//#else
|
||||
painter.drawPixmap(0, y, *buffer.get());
|
||||
//#endif
|
||||
}
|
||||
}
|
||||
|
||||
y += messageRef->getHeight();
|
||||
|
||||
end = messageRef;
|
||||
end = layout;
|
||||
if (y > height()) {
|
||||
break;
|
||||
}
|
||||
@@ -662,222 +562,168 @@ void ChannelView::drawMessages(QPainter &painter, bool overlays)
|
||||
}
|
||||
|
||||
// delete the message buffers that aren't on screen
|
||||
for (std::shared_ptr<messages::MessageRef> item : this->messagesOnScreen) {
|
||||
item->buffer.reset();
|
||||
for (const std::shared_ptr<messages::MessageLayout> &item : this->messagesOnScreen) {
|
||||
item->deleteBuffer();
|
||||
}
|
||||
|
||||
this->messagesOnScreen.clear();
|
||||
|
||||
// add all messages on screen to the map
|
||||
for (size_t i = start; i < messagesSnapshot.getLength(); ++i) {
|
||||
std::shared_ptr<messages::MessageRef> messageRef = messagesSnapshot[i];
|
||||
std::shared_ptr<messages::MessageLayout> layout = messagesSnapshot[i];
|
||||
|
||||
this->messagesOnScreen.insert(messageRef);
|
||||
this->messagesOnScreen.insert(layout);
|
||||
|
||||
if (messageRef.get() == end) {
|
||||
if (layout.get() == end) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ChannelView::updateMessageBuffer(messages::MessageRef *messageRef, QPixmap *buffer,
|
||||
int messageIndex)
|
||||
{
|
||||
QPainter painter(buffer);
|
||||
|
||||
painter.setRenderHint(QPainter::SmoothPixmapTransform);
|
||||
|
||||
// draw background
|
||||
// if (this->selectionMin.messageIndex <= messageIndex &&
|
||||
// this->selectionMax.messageIndex >= messageIndex) {
|
||||
// painter.fillRect(buffer->rect(), QColor(24, 55, 25));
|
||||
//} else {
|
||||
painter.fillRect(buffer->rect(),
|
||||
(messageRef->getMessage()->containsHighlightedPhrase())
|
||||
? this->themeManager.messages.backgrounds.highlighted
|
||||
: this->themeManager.messages.backgrounds.regular);
|
||||
//}
|
||||
|
||||
// draw selection
|
||||
if (!selection.isEmpty()) {
|
||||
drawMessageSelection(painter, messageRef, messageIndex, buffer->height());
|
||||
}
|
||||
|
||||
// draw message
|
||||
for (messages::WordPart const &wordPart : messageRef->getWordParts()) {
|
||||
// image
|
||||
if (wordPart.getWord().isImage()) {
|
||||
messages::LazyLoadedImage &lli = wordPart.getWord().getImage();
|
||||
|
||||
const QPixmap *image = lli.getPixmap();
|
||||
|
||||
if (image != nullptr && !lli.getAnimated()) {
|
||||
painter.drawPixmap(QRect(wordPart.getX(), wordPart.getY(), wordPart.getWidth(),
|
||||
wordPart.getHeight()),
|
||||
*image);
|
||||
}
|
||||
}
|
||||
// text
|
||||
else {
|
||||
QColor color = wordPart.getWord().getTextColor().getColor(this->themeManager);
|
||||
|
||||
this->themeManager.normalizeColor(color);
|
||||
|
||||
painter.setPen(color);
|
||||
painter.setFont(wordPart.getWord().getFont(this->getDpiMultiplier()));
|
||||
|
||||
painter.drawText(QRectF(wordPart.getX(), wordPart.getY(), 10000, 10000),
|
||||
wordPart.getText(), QTextOption(Qt::AlignLeft | Qt::AlignTop));
|
||||
}
|
||||
}
|
||||
|
||||
messageRef->updateBuffer = false;
|
||||
}
|
||||
|
||||
void ChannelView::drawMessageSelection(QPainter &painter, messages::MessageRef *messageRef,
|
||||
int messageIndex, int bufferHeight)
|
||||
{
|
||||
if (this->selection.min.messageIndex > messageIndex ||
|
||||
this->selection.max.messageIndex < messageIndex) {
|
||||
return;
|
||||
}
|
||||
|
||||
QColor selectionColor = this->themeManager.messages.selection;
|
||||
|
||||
int charIndex = 0;
|
||||
size_t i = 0;
|
||||
auto &parts = messageRef->getWordParts();
|
||||
|
||||
int currentLineNumber = 0;
|
||||
QRect rect;
|
||||
|
||||
if (parts.size() > 0) {
|
||||
if (selection.min.messageIndex == messageIndex) {
|
||||
rect.setTop(parts.at(0).getY());
|
||||
}
|
||||
rect.setLeft(parts.at(0).getX());
|
||||
}
|
||||
|
||||
// skip until selection start
|
||||
if (this->selection.min.messageIndex == messageIndex && this->selection.min.charIndex != 0) {
|
||||
for (; i < parts.size(); i++) {
|
||||
const messages::WordPart &part = parts.at(i);
|
||||
auto characterLength = part.getCharacterLength();
|
||||
|
||||
if (characterLength + charIndex > selection.min.charIndex) {
|
||||
break;
|
||||
}
|
||||
|
||||
charIndex += characterLength;
|
||||
currentLineNumber = part.getLineNumber();
|
||||
}
|
||||
|
||||
if (i >= parts.size()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// handle word that has a cut of selection
|
||||
const messages::WordPart &part = parts.at(i);
|
||||
|
||||
// check if selection if single word
|
||||
int characterLength = part.getCharacterLength();
|
||||
bool isSingleWord = charIndex + characterLength > this->selection.max.charIndex &&
|
||||
this->selection.max.messageIndex == messageIndex;
|
||||
|
||||
rect = part.getRect();
|
||||
currentLineNumber = part.getLineNumber();
|
||||
|
||||
if (part.getWord().isText()) {
|
||||
int offset = this->selection.min.charIndex - charIndex;
|
||||
|
||||
for (int j = 0; j < offset; j++) {
|
||||
rect.setLeft(rect.left() + part.getCharWidth(j, this->getDpiMultiplier()));
|
||||
}
|
||||
|
||||
if (isSingleWord) {
|
||||
int length = (this->selection.max.charIndex - charIndex) - offset;
|
||||
|
||||
rect.setRight(part.getX());
|
||||
|
||||
for (int j = 0; j < offset + length; j++) {
|
||||
rect.setRight(rect.right() + part.getCharWidth(j, this->getDpiMultiplier()));
|
||||
}
|
||||
|
||||
painter.fillRect(rect, selectionColor);
|
||||
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (isSingleWord) {
|
||||
if (charIndex + 1 != this->selection.max.charIndex) {
|
||||
rect.setRight(part.getX() + part.getWord().getImage().getScaledWidth());
|
||||
}
|
||||
painter.fillRect(rect, selectionColor);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (charIndex != this->selection.min.charIndex) {
|
||||
rect.setLeft(part.getX() + part.getWord().getImage().getScaledWidth());
|
||||
}
|
||||
}
|
||||
|
||||
i++;
|
||||
charIndex += characterLength;
|
||||
}
|
||||
|
||||
// go through lines and draw selection
|
||||
for (; i < parts.size(); i++) {
|
||||
const messages::WordPart &part = parts.at(i);
|
||||
|
||||
int charLength = part.getCharacterLength();
|
||||
|
||||
bool isLastSelectedWord = this->selection.max.messageIndex == messageIndex &&
|
||||
charIndex + charLength > this->selection.max.charIndex;
|
||||
|
||||
if (part.getLineNumber() == currentLineNumber) {
|
||||
rect.setLeft(std::min(rect.left(), part.getX()));
|
||||
rect.setTop(std::min(rect.top(), part.getY()));
|
||||
rect.setRight(std::max(rect.right(), part.getRight()));
|
||||
rect.setBottom(std::max(rect.bottom(), part.getBottom() - 1));
|
||||
} else {
|
||||
painter.fillRect(rect, selectionColor);
|
||||
|
||||
currentLineNumber = part.getLineNumber();
|
||||
|
||||
rect = part.getRect();
|
||||
}
|
||||
|
||||
if (isLastSelectedWord) {
|
||||
if (part.getWord().isText()) {
|
||||
int offset = this->selection.min.charIndex - charIndex;
|
||||
|
||||
int length = (this->selection.max.charIndex - charIndex) - offset;
|
||||
|
||||
rect.setRight(part.getX());
|
||||
|
||||
for (int j = 0; j < offset + length; j++) {
|
||||
rect.setRight(rect.right() + part.getCharWidth(j, this->getDpiMultiplier()));
|
||||
}
|
||||
} else {
|
||||
if (this->selection.max.charIndex == charIndex) {
|
||||
rect.setRight(part.getX());
|
||||
}
|
||||
}
|
||||
painter.fillRect(rect, selectionColor);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
charIndex += charLength;
|
||||
}
|
||||
|
||||
if (this->selection.max.messageIndex != messageIndex) {
|
||||
rect.setBottom(bufferHeight);
|
||||
}
|
||||
|
||||
painter.fillRect(rect, selectionColor);
|
||||
}
|
||||
// void ChannelView::drawMessageSelection(QPainter &painter, messages::MessageLayout *messageRef,
|
||||
// int messageIndex, int bufferHeight)
|
||||
//{
|
||||
// if (this->selection.min.messageIndex > messageIndex ||
|
||||
// this->selection.max.messageIndex < messageIndex) {
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// QColor selectionColor = this->themeManager.messages.selection;
|
||||
//
|
||||
// int charIndex = 0;
|
||||
// size_t i = 0;
|
||||
// auto &parts = messageRef->getWordParts();
|
||||
//
|
||||
// int currentLineNumber = 0;
|
||||
// QRect rect;
|
||||
//
|
||||
// if (parts.size() > 0) {
|
||||
// if (selection.min.messageIndex == messageIndex) {
|
||||
// rect.setTop(parts.at(0).getY());
|
||||
// }
|
||||
// rect.setLeft(parts.at(0).getX());
|
||||
// }
|
||||
//
|
||||
// // skip until selection start
|
||||
// if (this->selection.min.messageIndex == messageIndex && this->selection.min.charIndex != 0) {
|
||||
// for (; i < parts.size(); i++) {
|
||||
// const messages::MessageLayoutElement &part = parts.at(i);
|
||||
// auto characterLength = part.getCharacterLength();
|
||||
//
|
||||
// if (characterLength + charIndex > selection.min.charIndex) {
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// charIndex += characterLength;
|
||||
// currentLineNumber = part.getLineNumber();
|
||||
// }
|
||||
//
|
||||
// if (i >= parts.size()) {
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// // handle word that has a cut of selection
|
||||
// const messages::MessageLayoutElement &part = parts.at(i);
|
||||
//
|
||||
// // check if selection if single word
|
||||
// int characterLength = part.getCharacterLength();
|
||||
// bool isSingleWord = charIndex + characterLength > this->selection.max.charIndex &&
|
||||
// this->selection.max.messageIndex == messageIndex;
|
||||
//
|
||||
// rect = part.getRect();
|
||||
// currentLineNumber = part.getLineNumber();
|
||||
//
|
||||
// if (part.getWord().isText()) {
|
||||
// int offset = this->selection.min.charIndex - charIndex;
|
||||
//
|
||||
// for (int j = 0; j < offset; j++) {
|
||||
// rect.setLeft(rect.left() + part.getCharWidth(j, this->getDpiMultiplier()));
|
||||
// }
|
||||
//
|
||||
// if (isSingleWord) {
|
||||
// int length = (this->selection.max.charIndex - charIndex) - offset;
|
||||
//
|
||||
// rect.setRight(part.getX());
|
||||
//
|
||||
// for (int j = 0; j < offset + length; j++) {
|
||||
// rect.setRight(rect.right() + part.getCharWidth(j, this->getDpiMultiplier()));
|
||||
// }
|
||||
//
|
||||
// painter.fillRect(rect, selectionColor);
|
||||
//
|
||||
// return;
|
||||
// }
|
||||
// } else {
|
||||
// if (isSingleWord) {
|
||||
// if (charIndex + 1 != this->selection.max.charIndex) {
|
||||
// rect.setRight(part.getX() + part.getWord().getImage().getScaledWidth());
|
||||
// }
|
||||
// painter.fillRect(rect, selectionColor);
|
||||
//
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// if (charIndex != this->selection.min.charIndex) {
|
||||
// rect.setLeft(part.getX() + part.getWord().getImage().getScaledWidth());
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// i++;
|
||||
// charIndex += characterLength;
|
||||
// }
|
||||
//
|
||||
// // go through lines and draw selection
|
||||
// for (; i < parts.size(); i++) {
|
||||
// const messages::MessageLayoutElement &part = parts.at(i);
|
||||
//
|
||||
// int charLength = part.getCharacterLength();
|
||||
//
|
||||
// bool isLastSelectedWord = this->selection.max.messageIndex == messageIndex &&
|
||||
// charIndex + charLength > this->selection.max.charIndex;
|
||||
//
|
||||
// if (part.getLineNumber() == currentLineNumber) {
|
||||
// rect.setLeft(std::min(rect.left(), part.getX()));
|
||||
// rect.setTop(std::min(rect.top(), part.getY()));
|
||||
// rect.setRight(std::max(rect.right(), part.getRight()));
|
||||
// rect.setBottom(std::max(rect.bottom(), part.getBottom() - 1));
|
||||
// } else {
|
||||
// painter.fillRect(rect, selectionColor);
|
||||
//
|
||||
// currentLineNumber = part.getLineNumber();
|
||||
//
|
||||
// rect = part.getRect();
|
||||
// }
|
||||
//
|
||||
// if (isLastSelectedWord) {
|
||||
// if (part.getWord().isText()) {
|
||||
// int offset = this->selection.min.charIndex - charIndex;
|
||||
//
|
||||
// int length = (this->selection.max.charIndex - charIndex) - offset;
|
||||
//
|
||||
// rect.setRight(part.getX());
|
||||
//
|
||||
// for (int j = 0; j < offset + length; j++) {
|
||||
// rect.setRight(rect.right() + part.getCharWidth(j, this->getDpiMultiplier()));
|
||||
// }
|
||||
// } else {
|
||||
// if (this->selection.max.charIndex == charIndex) {
|
||||
// rect.setRight(part.getX());
|
||||
// }
|
||||
// }
|
||||
// painter.fillRect(rect, selectionColor);
|
||||
//
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
// charIndex += charLength;
|
||||
// }
|
||||
//
|
||||
// if (this->selection.max.messageIndex != messageIndex) {
|
||||
// rect.setBottom(bufferHeight);
|
||||
// }
|
||||
//
|
||||
// painter.fillRect(rect, selectionColor);
|
||||
//}
|
||||
|
||||
void ChannelView::wheelEvent(QWheelEvent *event)
|
||||
{
|
||||
@@ -888,7 +734,8 @@ void ChannelView::wheelEvent(QWheelEvent *event)
|
||||
float delta = event->delta() * 1.5 * mouseMultiplier;
|
||||
|
||||
auto snapshot = this->getMessagesSnapshot();
|
||||
int i = std::min((int)desired, (int)snapshot.getLength());
|
||||
int snapshotLength = (int)snapshot.getLength();
|
||||
int i = std::min((int)desired, snapshotLength);
|
||||
|
||||
if (delta > 0) {
|
||||
float scrollFactor = fmod(desired, 1);
|
||||
@@ -916,7 +763,7 @@ void ChannelView::wheelEvent(QWheelEvent *event)
|
||||
float scrollFactor = 1 - fmod(desired, 1);
|
||||
float currentScrollLeft = (int)(scrollFactor * snapshot[i]->getHeight());
|
||||
|
||||
for (; i < snapshot.getLength(); i++) {
|
||||
for (; i < snapshotLength; i++) {
|
||||
if (delta < currentScrollLeft) {
|
||||
desired += scrollFactor * ((double)delta / currentScrollLeft);
|
||||
break;
|
||||
@@ -925,7 +772,7 @@ void ChannelView::wheelEvent(QWheelEvent *event)
|
||||
desired += scrollFactor;
|
||||
}
|
||||
|
||||
if (i == snapshot.getLength() - 1) {
|
||||
if (i == snapshotLength - 1) {
|
||||
desired = snapshot.getLength();
|
||||
} else {
|
||||
snapshot[i + 1]->layout(LAYOUT_WIDTH, this->getDpiMultiplier());
|
||||
@@ -957,12 +804,12 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
|
||||
}
|
||||
|
||||
auto tooltipWidget = TooltipWidget::getInstance();
|
||||
std::shared_ptr<messages::MessageRef> message;
|
||||
std::shared_ptr<messages::MessageLayout> layout;
|
||||
QPoint relativePos;
|
||||
int messageIndex;
|
||||
|
||||
// no message under cursor
|
||||
if (!tryGetMessageAt(event->pos(), message, relativePos, messageIndex)) {
|
||||
if (!tryGetMessageAt(event->pos(), layout, relativePos, messageIndex)) {
|
||||
this->setCursor(Qt::ArrowCursor);
|
||||
tooltipWidget->hide();
|
||||
return;
|
||||
@@ -971,7 +818,7 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
|
||||
// is selecting
|
||||
if (this->selecting) {
|
||||
this->pause(500);
|
||||
int index = message->getSelectionIndex(relativePos);
|
||||
int index = layout->getSelectionIndex(relativePos);
|
||||
|
||||
this->setSelection(this->selection.start, SelectionItem(messageIndex, index));
|
||||
|
||||
@@ -979,29 +826,28 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
|
||||
}
|
||||
|
||||
// message under cursor is collapsed
|
||||
if (message->isCollapsed()) {
|
||||
if (layout->getFlags() & MessageLayout::Collapsed) {
|
||||
this->setCursor(Qt::PointingHandCursor);
|
||||
tooltipWidget->hide();
|
||||
return;
|
||||
}
|
||||
|
||||
// check if word underneath cursor
|
||||
const messages::Word *hoverWord;
|
||||
if ((hoverWord = message->tryGetWordPart(relativePos)) == nullptr) {
|
||||
const messages::MessageLayoutElement *hoverLayoutElement = layout->getElementAt(relativePos);
|
||||
|
||||
if (hoverLayoutElement == nullptr) {
|
||||
this->setCursor(Qt::ArrowCursor);
|
||||
tooltipWidget->hide();
|
||||
return;
|
||||
}
|
||||
const auto &tooltip = hoverWord->getTooltip();
|
||||
const auto &tooltip = hoverLayoutElement->getCreator().getTooltip();
|
||||
|
||||
if (hoverWord->isImage()) {
|
||||
tooltipWidget->moveTo(event->globalPos());
|
||||
tooltipWidget->setText(tooltip);
|
||||
tooltipWidget->show();
|
||||
}
|
||||
tooltipWidget->moveTo(event->globalPos());
|
||||
tooltipWidget->setText(tooltip);
|
||||
tooltipWidget->show();
|
||||
|
||||
// check if word has a link
|
||||
if (hoverWord->getLink().isValid()) {
|
||||
if (hoverLayoutElement->getCreator().getLink().isValid()) {
|
||||
this->setCursor(Qt::PointingHandCursor);
|
||||
} else {
|
||||
this->setCursor(Qt::ArrowCursor);
|
||||
@@ -1018,13 +864,13 @@ void ChannelView::mousePressEvent(QMouseEvent *event)
|
||||
|
||||
this->lastPressPosition = event->screenPos();
|
||||
|
||||
std::shared_ptr<messages::MessageRef> message;
|
||||
std::shared_ptr<messages::MessageLayout> layout;
|
||||
QPoint relativePos;
|
||||
int messageIndex;
|
||||
|
||||
this->mouseDown(event);
|
||||
|
||||
if (!tryGetMessageAt(event->pos(), message, relativePos, messageIndex)) {
|
||||
if (!tryGetMessageAt(event->pos(), layout, relativePos, messageIndex)) {
|
||||
setCursor(Qt::ArrowCursor);
|
||||
|
||||
auto messagesSnapshot = this->getMessagesSnapshot();
|
||||
@@ -1045,11 +891,11 @@ void ChannelView::mousePressEvent(QMouseEvent *event)
|
||||
}
|
||||
|
||||
// check if message is collapsed
|
||||
if (message->isCollapsed()) {
|
||||
if (layout->getFlags() & MessageLayout::Collapsed) {
|
||||
return;
|
||||
}
|
||||
|
||||
int index = message->getSelectionIndex(relativePos);
|
||||
int index = layout->getSelectionIndex(relativePos);
|
||||
|
||||
auto selectionItem = SelectionItem(messageIndex, index);
|
||||
this->setSelection(selectionItem, selectionItem);
|
||||
@@ -1087,30 +933,30 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)
|
||||
|
||||
// show user thing pajaW
|
||||
|
||||
std::shared_ptr<messages::MessageRef> message;
|
||||
std::shared_ptr<messages::MessageLayout> layout;
|
||||
QPoint relativePos;
|
||||
int messageIndex;
|
||||
|
||||
if (!tryGetMessageAt(event->pos(), message, relativePos, messageIndex)) {
|
||||
if (!tryGetMessageAt(event->pos(), layout, relativePos, messageIndex)) {
|
||||
// No message at clicked position
|
||||
this->userPopupWidget.hide();
|
||||
return;
|
||||
}
|
||||
|
||||
// message under cursor is collapsed
|
||||
if (message->isCollapsed()) {
|
||||
message->setCollapsed(false);
|
||||
if (layout->getFlags() & MessageLayout::Collapsed) {
|
||||
layout->addFlags(MessageLayout::Collapsed);
|
||||
this->layoutMessages();
|
||||
return;
|
||||
}
|
||||
|
||||
const messages::Word *hoverWord;
|
||||
const messages::MessageLayoutElement *hoverLayoutElement = layout->getElementAt(relativePos);
|
||||
|
||||
if ((hoverWord = message->tryGetWordPart(relativePos)) == nullptr) {
|
||||
if (hoverLayoutElement == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto &link = hoverWord->getLink();
|
||||
auto &link = hoverLayoutElement->getCreator().getLink();
|
||||
|
||||
switch (link.getType()) {
|
||||
case messages::Link::UserInfo: {
|
||||
@@ -1131,7 +977,7 @@ void ChannelView::mouseReleaseEvent(QMouseEvent *event)
|
||||
}
|
||||
}
|
||||
|
||||
bool ChannelView::tryGetMessageAt(QPoint p, std::shared_ptr<messages::MessageRef> &_message,
|
||||
bool ChannelView::tryGetMessageAt(QPoint p, std::shared_ptr<messages::MessageLayout> &_message,
|
||||
QPoint &relativePos, int &index)
|
||||
{
|
||||
auto messagesSnapshot = this->getMessagesSnapshot();
|
||||
|
||||
Reference in New Issue
Block a user