noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash happening when QuickSwitcher is used with popout window (#4187)

Browse source 
Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com>
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
This commit is contained in:
kornes 2022-11-25 09:34:01 +00:00 committed by GitHub
parent b3e400a049
commit 330e0a99fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -2,6 +2,7 @@
## Unversioned ## Unversioned
- Bugfix: Fixed crash happening when QuickSwitcher is used with a popout window. (#4187)
- Bugfix: Fixed low contrast of text in settings tooltips. (#4188) - Bugfix: Fixed low contrast of text in settings tooltips. (#4188)
- Bugfix: Fixed being unable to see the usercard of VIPs who have Asian language display names. (#4174) - Bugfix: Fixed being unable to see the usercard of VIPs who have Asian language display names. (#4174)
- Bugfix: Fixed the wrong right-click menu showing in the chat input box. (#4177) - Bugfix: Fixed the wrong right-click menu showing in the chat input box. (#4177)

53
src/widgets/Notebook.cpp
View file

@ -156,32 +156,38 @@ int Notebook::indexOf(QWidget *page) const
void Notebook::select(QWidget *page, bool focusPage) void Notebook::select(QWidget *page, bool focusPage)
{ {
if (!page)
{
return;
}
if (page == this->selectedPage_) if (page == this->selectedPage_)
{ {
return; return;
} }
if (page != nullptr) auto *item = this->findItem(page);
if (!item)
{ {
page->setHidden(false); return;
}
assert(this->containsPage(page)); page->show();
Item &item = this->findItem(page);
item.tab->setSelected(true); item->tab->setSelected(true);
item.tab->raise(); item->tab->raise();
if (focusPage) if (focusPage)
{ {
if (item.selectedWidget == nullptr) if (item->selectedWidget == nullptr)
{ {
item.page->setFocus(); item->page->setFocus();
} }
else else
{ {
if (containsChild(page, item.selectedWidget)) if (containsChild(page, item->selectedWidget))
{ {
item.selectedWidget->setFocus(Qt::MouseFocusReason); item->selectedWidget->setFocus(Qt::MouseFocusReason);
} }
else else
{ {
@ -190,20 +196,18 @@ void Notebook::select(QWidget *page, bool focusPage)
} }
} }
} }
}
if (this->selectedPage_ != nullptr) if (this->selectedPage_ != nullptr)
{ {
this->selectedPage_->setHidden(true); this->selectedPage_->hide();
Item &item = this->findItem(selectedPage_); auto *item = this->findItem(selectedPage_);
item.tab->setSelected(false); if (!item)
{
// for (auto split : this->selectedPage->getSplits()) { return;
// split->updateLastReadMessage(); }
// } item->tab->setSelected(false);
item->selectedWidget = this->selectedPage_->focusWidget();
item.selectedWidget = this->selectedPage_->focusWidget();
} }
this->selectedPage_ = page; this->selectedPage_ = page;
@ -219,14 +223,17 @@ bool Notebook::containsPage(QWidget *page)
}); });
} }
Notebook::Item &Notebook::findItem(QWidget *page) Notebook::Item *Notebook::findItem(QWidget *page)
{ {
auto it = std::find_if(this->items_.begin(), this->items_.end(), auto it = std::find_if(this->items_.begin(), this->items_.end(),
[page](const auto &item) { [page](const auto &item) {
return page == item.page; return page == item.page;
}); });
assert(it != this->items_.end()); if (it != this->items_.end())
return *it; {
return &(*it);
}
return nullptr;
} }
bool Notebook::containsChild(const QObject *obj, const QObject *child) bool Notebook::containsChild(const QObject *obj, const QObject *child)

2
src/widgets/Notebook.hpp
View file

@ -90,7 +90,7 @@ private:
void resizeAddButton(); void resizeAddButton();
bool containsPage(QWidget *page); bool containsPage(QWidget *page);
Item &findItem(QWidget *page); Item *findItem(QWidget *page);
static bool containsChild(const QObject *obj, const QObject *child); static bool containsChild(const QObject *obj, const QObject *child);
NotebookTab *getTabFromPage(QWidget *page); NotebookTab *getTabFromPage(QWidget *page);