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.

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

Fixed splits staying paused after unfocusing Chatterino in certain configurations #5504

Merged
merged 2 commits into from
Jul 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
- Bugfix: Fixed a crash when tab completing while having an invalid plugin loaded. (#5401)
- Bugfix: Fixed windows on Windows not saving correctly when snapping them to the edges. (#5478)
- Bugfix: Fixed `/clearmessages` not working with more than one window. (#5489)
- Bugfix: Fixed splits staying paused after unfocusing Chatterino in certain configurations. (#5504)
- Dev: Update Windows build from Qt 6.5.0 to Qt 6.7.1. (#5420)
- Dev: Update vcpkg build Qt from 6.5.0 to 6.7.0, boost from 1.83.0 to 1.85.0, openssl from 3.1.3 to 3.3.0. (#5422)
- Dev: Unsingletonize `ISoundController`. (#5462)
Expand Down
7 changes: 7 additions & 0 deletions src/widgets/Window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include <QDesktopServices>
#include <QHeaderView>
#include <QMenuBar>
#include <QObject>
#include <QPalette>
#include <QStandardItemModel>
#include <QVBoxLayout>
Expand Down Expand Up @@ -112,6 +113,12 @@ bool Window::event(QEvent *event)
}

case QEvent::WindowDeactivate: {
for (const auto &split :
this->notebook_->getSelectedPage()->getSplits())
{
split->unpause();
}

auto *page = this->notebook_->getSelectedPage();

if (page != nullptr)
Expand Down
7 changes: 7 additions & 0 deletions src/widgets/splits/Split.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1599,6 +1599,13 @@ void Split::setInputReply(const MessagePtr &reply)
this->input_->setReply(reply);
}

void Split::unpause()
{
this->view_->unpause(PauseReason::KeyboardModifier);
this->view_->unpause(PauseReason::DoubleClick);
// Mouse intentionally left out, we may still have the mouse over the split
}

} // namespace chatterino

QDebug operator<<(QDebug dbg, const chatterino::Split &split)
Expand Down
3 changes: 3 additions & 0 deletions src/widgets/splits/Split.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ class Split : public BaseWidget

void setInputReply(const MessagePtr &reply);

// This is called on window focus lost
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Documentation should say what an entity does, not where it's used. It could say where it's supposed to be used.

void unpause();

static pajlada::Signals::Signal<Qt::KeyboardModifiers>
modifierStatusChanged;
static Qt::KeyboardModifiers modifierStatus;
Expand Down
Loading