From c65ebd26bd851055d0a8d7b178b04e89cd02f734 Mon Sep 17 00:00:00 2001 From: nerix Date: Fri, 29 Dec 2023 15:10:56 +0100 Subject: [PATCH] fix: non-native drag on Windows (#5051) --- CHANGELOG.md | 4 ++-- src/widgets/BaseWindow.cpp | 5 +++++ src/widgets/dialogs/ReplyThreadPopup.cpp | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 646d43713..5d00a7257 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,8 +52,8 @@ - Bugfix: Hide the Usercard button in the User Info Popup when in special channels. (#4972) - 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 crash that could occur when using certain features in a Usercard after closing the split from which it was created. (#5034, #5051) +- 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, #5051) - Bugfix: Fixed a bug on Wayland where tooltips would spawn as separate windows instead of behaving like tooltips. (#4998, #5040) - Bugfix: Fixes to section deletion in text input fields. (#5013) - Bugfix: Show user text input within watch streak notices. (#5029) diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp index 062f9efc9..d65490cea 100644 --- a/src/widgets/BaseWindow.cpp +++ b/src/widgets/BaseWindow.cpp @@ -1091,6 +1091,11 @@ bool BaseWindow::handleNCHITTEST(MSG *msg, long *result) return true; } + if (widget == this) + { + return false; + } + return recursiveCheckMouseTracking(widget->parentWidget()); }; diff --git a/src/widgets/dialogs/ReplyThreadPopup.cpp b/src/widgets/dialogs/ReplyThreadPopup.cpp index 708b8f0a2..1d84e1a40 100644 --- a/src/widgets/dialogs/ReplyThreadPopup.cpp +++ b/src/widgets/dialogs/ReplyThreadPopup.cpp @@ -159,7 +159,8 @@ ReplyThreadPopup::ReplyThreadPopup(bool closeAutomatically, Split *split) this->thread_->markUnsubscribed(); } }); - hbox->addWidget(this->ui_.notificationCheckbox, 1); + hbox->addWidget(this->ui_.notificationCheckbox); + hbox->addStretch(1); this->ui_.notificationCheckbox->setFocusPolicy(Qt::NoFocus); }