noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove remnants of different strategy

Browse source
This commit is contained in:
unknown 2024-10-28 13:41:16 +01:00
parent 05ab3b27e7
commit 0e506fc175
5 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/widgets/helper/ChannelView.cpp
View file

@ -1194,13 +1194,11 @@ void ChannelView::messageAppended(MessagePtr &message,
(this->channel_->getType() == Channel::Type::TwitchAutomod &&
getSettings()->enableAutomodHighlight))
{
this->tabHighlightRequested.invoke(HighlightState::Highlighted,
message);
this->tabHighlightRequested.invoke(HighlightState::Highlighted);
}
else
{
this->tabHighlightRequested.invoke(HighlightState::NewMessage,
message);
this->tabHighlightRequested.invoke(HighlightState::NewMessage);
}
}

3
src/widgets/helper/ChannelView.hpp
View file

@ -225,8 +225,7 @@ public:
pajlada::Signals::Signal<QMouseEvent *> mouseDown;
pajlada::Signals::NoArgSignal selectionChanged;
pajlada::Signals::Signal<HighlightState, const MessagePtr &>
tabHighlightRequested;
pajlada::Signals::Signal<HighlightState> tabHighlightRequested;
pajlada::Signals::NoArgSignal liveStatusChanged;
pajlada::Signals::Signal<const Link &> linkClicked;
pajlada::Signals::Signal<QString, FromTwitchLinkOpenChannelIn>

13
src/widgets/helper/NotebookTab.cpp
View file

@ -518,8 +518,7 @@ void NotebookTab::setHighlightState(HighlightState newHighlightStyle)
}
void NotebookTab::updateHighlightState(HighlightState newHighlightStyle,
const ChannelView &channelViewSource,
const MessagePtr &message)
const ChannelView &channelViewSource)
{
if (this->isSelected())
{
@ -528,7 +527,7 @@ void NotebookTab::updateHighlightState(HighlightState newHighlightStyle,
return;
}
if (!this->shouldMessageHighlight(channelViewSource, message))
if (!this->shouldMessageHighlight(channelViewSource))
{
return;
}
@ -572,8 +571,8 @@ void NotebookTab::updateHighlightState(HighlightState newHighlightStyle,
this->update();
}
bool NotebookTab::shouldMessageHighlight(const ChannelView &channelViewSource,
const MessagePtr &message) const
bool NotebookTab::shouldMessageHighlight(
const ChannelView &channelViewSource) const
{
auto *visibleSplitContainer =
dynamic_cast<SplitContainer *>(this->notebook_->getSelectedPage());
@ -583,9 +582,7 @@ bool NotebookTab::shouldMessageHighlight(const ChannelView &channelViewSource,
for (const auto &visibleSplit : visibleSplits)
{
if (channelViewSource.getID() ==
visibleSplit->getChannelView().getID() &&
visibleSplit->getChannelView().shouldIncludeMessage(message) &&
channelViewSource.shouldIncludeMessage(message))
visibleSplit->getChannelView().getID())
{
return false;
}

6
src/widgets/helper/NotebookTab.hpp
View file

@ -72,8 +72,7 @@ public:
* Obeys the HighlightsEnabled setting and the highlight state hierarchy and tracks the highlight state update sources
*/
void updateHighlightState(HighlightState style,
const ChannelView &channelViewSource,
const MessagePtr &message);
const ChannelView &channelViewSource);
void copyHighlightStateAndSourcesFrom(const NotebookTab *sourceTab);
void setHighlightsEnabled(const bool &newVal);
void newHighlightSourceAdded(const ChannelView &channelViewSource);
@ -122,8 +121,7 @@ private:
int normalTabWidthForHeight(int height) const;
bool shouldMessageHighlight(const ChannelView &channelViewSource,
const MessagePtr &message) const;
bool shouldMessageHighlight(const ChannelView &channelViewSource) const;
using HighlightSources =
std::unordered_map<ChannelView::ChannelViewID, HighlightState>;

17
src/widgets/splits/SplitContainer.cpp
View file

@ -213,15 +213,14 @@ void SplitContainer::addSplit(Split *split)
auto &&conns = this->connectionsPerSplit_[split];
conns.managedConnect(
split->getChannelView().tabHighlightRequested,
[this, split](HighlightState state, const MessagePtr &message) {
if (this->tab_ != nullptr)
{
this->tab_->updateHighlightState(state, split->getChannelView(),
message);
}
});
conns.managedConnect(split->getChannelView().tabHighlightRequested,
[this, split](HighlightState state) {
if (this->tab_ != nullptr)
{
this->tab_->updateHighlightState(
state, split->getChannelView());
}
});
conns.managedConnect(split->channelChanged, [this, split] {
if (this->tab_ != nullptr)