Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix channel search when custom scrollback limit is used #4496

Merged
merged 5 commits into from
Apr 1, 2023
Merged

Fix channel search when custom scrollback limit is used #4496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f56d993
set custom queue limit for channel messages_
kornes Mar 31, 2023
7bcf960
use scrollback setting for searchPopup channelView_
kornes Mar 31, 2023
1240417
changelog
kornes Mar 31, 2023
fc0d853
Add unrelated test asserts
pajlada Apr 1, 2023
1820397
Merge branch 'master' into fix_channel-msg-limit
pajlada Apr 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
- Bugfix: Fixed placeholder color in Qt 6. (#4477)
- Bugfix: Fixed blocked user list being empty when opening the settings dialog for the first time. (#4437)
- Bugfix: Fixed blocked user list sticking around when switching from a logged in user to being logged out. (#4437)
- Bugfix: Fixed search popup ignoring setting for message scrollback limit. (#4496)
- Bugfix: Fixed a memory leak that occurred when loading message history. This was mostly noticeable with unstable internet connections where reconnections were frequent or long-running instances of Chatterino. (#4499)
- Dev: Disabling precompiled headers on Windows is now tested in CI. (#4472)
- Dev: Ignore unhandled BTTV user-events. (#4438)
Expand Down
1 change: 1 addition & 0 deletions src/common/Channel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Channel::Channel(const QString &name, Type type)
: completionModel(*this)
, lastDate_(QDate::currentDate())
, name_(name)
, messages_(getSettings()->scrollbackSplitLimit)
, type_(type)
{
}
Expand Down
6 changes: 4 additions & 2 deletions src/widgets/helper/SearchPopup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "messages/search/RegexPredicate.hpp"
#include "messages/search/SubstringPredicate.hpp"
#include "messages/search/SubtierPredicate.hpp"
#include "singletons/Settings.hpp"
#include "singletons/WindowManager.hpp"
#include "widgets/helper/ChannelView.hpp"
#include "widgets/splits/Split.hpp"
Expand Down Expand Up @@ -285,8 +286,9 @@ void SearchPopup::initLayout()

// CHANNELVIEW
{
this->channelView_ = new ChannelView(this, this->split_,
ChannelView::Context::Search);
this->channelView_ = new ChannelView(
this, this->split_, ChannelView::Context::Search,
getSettings()->scrollbackSplitLimit);

layout1->addWidget(this->channelView_);
}
Expand Down