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: restore focus of last split when restoring (#5080)

Browse source
This commit is contained in:
nerix 2024-01-14 12:06:52 +01:00 committed by GitHub
parent 1554d7b6a4
commit c4c62f2796
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -65,6 +65,7 @@
- Bugfix: Fixed avatar in usercard and moderation button triggering when releasing the mouse outside their area. (#5052) - Bugfix: Fixed avatar in usercard and moderation button triggering when releasing the mouse outside their area. (#5052)
- Bugfix: Fixed moderator-only topics being subscribed to for non-moderators. (#5056) - Bugfix: Fixed moderator-only topics being subscribed to for non-moderators. (#5056)
- Bugfix: Fixed a bug where buttons would remain in a hovered state after leaving them. (#5077) - Bugfix: Fixed a bug where buttons would remain in a hovered state after leaving them. (#5077)
- Bugfix: Fixed splits not retaining their focus after minimizing. (#5080)
- Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978) - Dev: Run miniaudio in a separate thread, and simplify it to not manage the device ourselves. There's a chance the simplification is a bad idea. (#4978)
- Dev: Change clang-format from v14 to v16. (#4929) - Dev: Change clang-format from v14 to v16. (#4929)
- Dev: Fixed UTF16 encoding of `modes` file for the installer. (#4791) - Dev: Fixed UTF16 encoding of `modes` file for the installer. (#4791)

14
src/widgets/Notebook.cpp
View file

@ -1332,13 +1332,19 @@ SplitNotebook::SplitNotebook(Window *parent)
}); });
} }
void SplitNotebook::showEvent(QShowEvent *) void SplitNotebook::showEvent(QShowEvent * /*event*/)
{ {
if (auto page = this->getSelectedPage()) if (auto *page = this->getSelectedPage())
{ {
if (auto split = page->findChild<Split *>()) auto *split = page->getSelectedSplit();
if (!split)
{ {
split->setFocus(Qt::FocusReason::OtherFocusReason); split = page->findChild<Split *>();
}
if (split)
{
split->setFocus(Qt::OtherFocusReason);
} }
} }
} }