Tabs now highlight when a highlight is received

Work on #88
This commit is contained in:
Rasmus Karlsson
2017-12-26 12:32:24 +01:00
parent 7a8cc91eec
commit 13b39e374b
8 changed files with 29 additions and 6 deletions
+5 -1
View File
@@ -354,6 +354,10 @@ void ChannelView::setChannel(std::shared_ptr<Channel> newChannel)
}
}
if (message->containsHighlightedPhrase()) {
this->highlightedMessageReceived.invoke();
}
layoutMessages();
update();
});
@@ -533,7 +537,7 @@ void ChannelView::updateMessageBuffer(messages::MessageRef *messageRef, QPixmap
// this->selectionMax.messageIndex >= messageIndex) {
// painter.fillRect(buffer->rect(), QColor(24, 55, 25));
//} else {
painter.fillRect(buffer->rect(), (messageRef->getMessage()->getCanHighlightTab())
painter.fillRect(buffer->rect(), (messageRef->getMessage()->containsHighlightedPhrase())
? this->colorScheme.ChatBackgroundHighlighted
: this->colorScheme.ChatBackground);
//}
+2 -1
View File
@@ -15,8 +15,8 @@
#include <QTimer>
#include <QWheelEvent>
#include <QWidget>
#include <boost/signals2.hpp>
#include <pajlada/signals/signal.hpp>
namespace chatterino {
namespace widgets {
@@ -103,6 +103,7 @@ public:
boost::signals2::signal<void(QMouseEvent *)> mouseDown;
boost::signals2::signal<void()> selectionChanged;
pajlada::Signals::NoArgSignal highlightedMessageReceived;
protected:
virtual void resizeEvent(QResizeEvent *) override;
+6
View File
@@ -107,11 +107,17 @@ void NotebookTab::setSelected(bool value)
{
this->selected = value;
this->highlightState = HighlightState::None;
this->update();
}
void NotebookTab::setHighlightState(HighlightState newHighlightStyle)
{
if (this->isSelected()) {
return;
}
this->highlightState = newHighlightStyle;
this->update();