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

fix: don't change the topmost value of child windows (#5330)

Browse source
This commit is contained in:
nerix 2024-04-18 16:24:12 +02:00 committed by GitHub
parent b391f18177
commit 86a27823a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -9,6 +9,7 @@
- Bugfix: Fixed split tooltip getting stuck in some cases. (#5309) - Bugfix: Fixed split tooltip getting stuck in some cases. (#5309)
- Bugfix: Fixed the version string not showing up as expected in Finder on macOS. (#5311) - Bugfix: Fixed the version string not showing up as expected in Finder on macOS. (#5311)
- Bugfix: Fixed links having `http://` added to the beginning in certain cases. (#5323) - Bugfix: Fixed links having `http://` added to the beginning in certain cases. (#5323)
- Bugfix: Fixed topmost windows from losing their status after opening dialogs on Windows. (#5330)
- Bugfix: Fixed a gap appearing when using filters on `/watching`. (#5329) - Bugfix: Fixed a gap appearing when using filters on `/watching`. (#5329)
## 2.5.0-beta.1 ## 2.5.0-beta.1

7
src/widgets/BaseWindow.cpp
View file

@ -263,6 +263,13 @@ void BaseWindow::tryApplyTopMost()
} }
this->waitingForTopMost_ = false; this->waitingForTopMost_ = false;
if (this->parent())
{
// Don't change the topmost value of child windows. This would apply
// to the top-level window too.
return;
}
::SetWindowPos(*hwnd, this->isTopMost_ ? HWND_TOPMOST : HWND_NOTOPMOST, 0, ::SetWindowPos(*hwnd, this->isTopMost_ ? HWND_TOPMOST : HWND_NOTOPMOST, 0,
0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
} }