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

Don't add QLayouts to QWidgets that already have one (#4672)

Browse source
This commit is contained in:
nerix 2023-06-10 12:55:47 +02:00 committed by GitHub
parent f0c4eb7caa
commit 335dff53af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -15,6 +15,7 @@
- Dev: Added tools to help debug image GC. (#4578)
- Dev: Removed duplicate license when having plugins enabled. (#4665)
- Dev: Replace our QObjectRef class with Qt's QPointer class. (#4666)
- Dev: Fixed warnings about QWidgets already having a QLayout. (#4672)
- Dev: Fixed undefined behavior when loading non-existant credentials. (#4673)
## 2.4.4

2
src/widgets/Window.cpp
View file

@ -152,7 +152,7 @@ void Window::closeEvent(QCloseEvent *)
void Window::addLayout()
{
QVBoxLayout *layout = new QVBoxLayout(this);
auto *layout = new QVBoxLayout();
layout->addWidget(this->notebook_);
this->getLayoutContainer()->setLayout(layout);

4
src/widgets/dialogs/EmotePopup.cpp
View file

@ -209,7 +209,7 @@ EmotePopup::EmotePopup(QWidget *parent)
this->setStayInScreenRect(true);
this->moveTo(this, getApp()->windows->emotePopupPos(), false);
auto *layout = new QVBoxLayout(this);
auto *layout = new QVBoxLayout();
this->getLayoutContainer()->setLayout(layout);
QRegularExpression searchRegex("\\S*");
@ -218,7 +218,7 @@ EmotePopup::EmotePopup(QWidget *parent)
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);
auto *layout2 = new QHBoxLayout(this);
auto *layout2 = new QHBoxLayout();
layout2->setContentsMargins(8, 8, 8, 8);
layout2->setSpacing(8);

2
src/widgets/helper/EditableModelView.cpp
View file

@ -32,7 +32,7 @@ EditableModelView::EditableModelView(QAbstractTableModel *model, bool movable)
vbox->setContentsMargins(0, 0, 0, 0);
// create button layout
QHBoxLayout *buttons = new QHBoxLayout(this);
auto *buttons = new QHBoxLayout();
this->buttons_ = buttons;
vbox->addLayout(buttons);

2
src/widgets/helper/SearchPopup.cpp
View file

@ -280,7 +280,7 @@ void SearchPopup::initLayout()
// HBOX
{
auto *layout2 = new QHBoxLayout(this);
auto *layout2 = new QHBoxLayout();
layout2->setContentsMargins(8, 8, 8, 8);
layout2->setSpacing(8);

2
src/widgets/splits/Split.cpp
View file

@ -1124,7 +1124,7 @@ void Split::showViewerList()
viewerDock->move(0, this->header_->height());
auto multiWidget = new QWidget(viewerDock);
auto dockVbox = new QVBoxLayout(viewerDock);
auto *dockVbox = new QVBoxLayout();
auto searchBar = new QLineEdit(viewerDock);
auto chattersList = new QListWidget();