mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
fix: ReplyThreadPopup now requires a split as its parent (#5036)
Co-authored-by: Nerixyz <nerixdev@outlook.de>
This commit is contained in:
parent
5dd8c1c88a
commit
0395b692e4
|
@ -52,6 +52,7 @@
|
|||
- Bugfix: Fixed support for Windows 11 Snap layouts. (#4994)
|
||||
- Bugfix: Fixed some windows appearing between screens. (#4797)
|
||||
- Bugfix: Fixed a crash that could occur when using certain features in a Usercard after closing the split from which it was created. (#5034)
|
||||
- Bugfix: Fixed a crash that could occur when using certain features in a Reply popup after closing the split from which it was created. (#5036)
|
||||
- Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998)
|
||||
- Bugfix: Fixes to section deletion in text input fields. (#5013)
|
||||
- Bugfix: Show user text input within watch streak notices. (#5029)
|
||||
|
|
|
@ -24,11 +24,12 @@ const QString TEXT_TITLE("Reply Thread - @%1 in #%2");
|
|||
|
||||
namespace chatterino {
|
||||
|
||||
ReplyThreadPopup::ReplyThreadPopup(bool closeAutomatically, QWidget *parent,
|
||||
Split *split)
|
||||
: DraggablePopup(closeAutomatically, parent)
|
||||
ReplyThreadPopup::ReplyThreadPopup(bool closeAutomatically, Split *split)
|
||||
: DraggablePopup(closeAutomatically, split)
|
||||
, split_(split)
|
||||
{
|
||||
assert(split != nullptr);
|
||||
|
||||
this->setWindowTitle(QStringLiteral("Reply Thread"));
|
||||
|
||||
HotkeyController::HotkeyMap actions{
|
||||
|
|
|
@ -20,7 +20,11 @@ class ReplyThreadPopup final : public DraggablePopup
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
ReplyThreadPopup(bool closeAutomatically, QWidget *parent, Split *split);
|
||||
/**
|
||||
* @param closeAutomatically Decides whether the popup should close when it loses focus
|
||||
* @param split Will be used as the popup's parent. Must not be null
|
||||
*/
|
||||
explicit ReplyThreadPopup(bool closeAutomatically, Split *split);
|
||||
|
||||
void setThread(std::shared_ptr<MessageThread> thread);
|
||||
void giveFocus(Qt::FocusReason reason);
|
||||
|
|
|
@ -2917,10 +2917,8 @@ void ChannelView::showReplyThreadPopup(const MessagePtr &message)
|
|||
return;
|
||||
}
|
||||
|
||||
auto *popupParent =
|
||||
static_cast<QWidget *>(&(getApp()->windows->getMainWindow()));
|
||||
auto *popup = new ReplyThreadPopup(getSettings()->autoCloseThreadPopup,
|
||||
popupParent, this->split_);
|
||||
auto *popup =
|
||||
new ReplyThreadPopup(getSettings()->autoCloseThreadPopup, this->split_);
|
||||
|
||||
popup->setThread(message->replyThread);
|
||||
|
||||
|
|
Loading…
Reference in a new issue