Don't add QLayouts to QWidgets that already have one (#4672)
This commit is contained in:
@@ -15,6 +15,7 @@
|
|||||||
- Dev: Added tools to help debug image GC. (#4578)
|
- Dev: Added tools to help debug image GC. (#4578)
|
||||||
- Dev: Removed duplicate license when having plugins enabled. (#4665)
|
- Dev: Removed duplicate license when having plugins enabled. (#4665)
|
||||||
- Dev: Replace our QObjectRef class with Qt's QPointer class. (#4666)
|
- 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)
|
- Dev: Fixed undefined behavior when loading non-existant credentials. (#4673)
|
||||||
|
|
||||||
## 2.4.4
|
## 2.4.4
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ void Window::closeEvent(QCloseEvent *)
|
|||||||
|
|
||||||
void Window::addLayout()
|
void Window::addLayout()
|
||||||
{
|
{
|
||||||
QVBoxLayout *layout = new QVBoxLayout(this);
|
auto *layout = new QVBoxLayout();
|
||||||
|
|
||||||
layout->addWidget(this->notebook_);
|
layout->addWidget(this->notebook_);
|
||||||
this->getLayoutContainer()->setLayout(layout);
|
this->getLayoutContainer()->setLayout(layout);
|
||||||
|
|||||||
@@ -209,7 +209,7 @@ EmotePopup::EmotePopup(QWidget *parent)
|
|||||||
this->setStayInScreenRect(true);
|
this->setStayInScreenRect(true);
|
||||||
this->moveTo(this, getApp()->windows->emotePopupPos(), false);
|
this->moveTo(this, getApp()->windows->emotePopupPos(), false);
|
||||||
|
|
||||||
auto *layout = new QVBoxLayout(this);
|
auto *layout = new QVBoxLayout();
|
||||||
this->getLayoutContainer()->setLayout(layout);
|
this->getLayoutContainer()->setLayout(layout);
|
||||||
|
|
||||||
QRegularExpression searchRegex("\\S*");
|
QRegularExpression searchRegex("\\S*");
|
||||||
@@ -218,7 +218,7 @@ EmotePopup::EmotePopup(QWidget *parent)
|
|||||||
layout->setContentsMargins(0, 0, 0, 0);
|
layout->setContentsMargins(0, 0, 0, 0);
|
||||||
layout->setSpacing(0);
|
layout->setSpacing(0);
|
||||||
|
|
||||||
auto *layout2 = new QHBoxLayout(this);
|
auto *layout2 = new QHBoxLayout();
|
||||||
layout2->setContentsMargins(8, 8, 8, 8);
|
layout2->setContentsMargins(8, 8, 8, 8);
|
||||||
layout2->setSpacing(8);
|
layout2->setSpacing(8);
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ EditableModelView::EditableModelView(QAbstractTableModel *model, bool movable)
|
|||||||
vbox->setContentsMargins(0, 0, 0, 0);
|
vbox->setContentsMargins(0, 0, 0, 0);
|
||||||
|
|
||||||
// create button layout
|
// create button layout
|
||||||
QHBoxLayout *buttons = new QHBoxLayout(this);
|
auto *buttons = new QHBoxLayout();
|
||||||
this->buttons_ = buttons;
|
this->buttons_ = buttons;
|
||||||
vbox->addLayout(buttons);
|
vbox->addLayout(buttons);
|
||||||
|
|
||||||
|
|||||||
@@ -280,7 +280,7 @@ void SearchPopup::initLayout()
|
|||||||
|
|
||||||
// HBOX
|
// HBOX
|
||||||
{
|
{
|
||||||
auto *layout2 = new QHBoxLayout(this);
|
auto *layout2 = new QHBoxLayout();
|
||||||
layout2->setContentsMargins(8, 8, 8, 8);
|
layout2->setContentsMargins(8, 8, 8, 8);
|
||||||
layout2->setSpacing(8);
|
layout2->setSpacing(8);
|
||||||
|
|
||||||
|
|||||||
@@ -1124,7 +1124,7 @@ void Split::showViewerList()
|
|||||||
viewerDock->move(0, this->header_->height());
|
viewerDock->move(0, this->header_->height());
|
||||||
|
|
||||||
auto multiWidget = new QWidget(viewerDock);
|
auto multiWidget = new QWidget(viewerDock);
|
||||||
auto dockVbox = new QVBoxLayout(viewerDock);
|
auto *dockVbox = new QVBoxLayout();
|
||||||
auto searchBar = new QLineEdit(viewerDock);
|
auto searchBar = new QLineEdit(viewerDock);
|
||||||
|
|
||||||
auto chattersList = new QListWidget();
|
auto chattersList = new QListWidget();
|
||||||
|
|||||||
Reference in New Issue
Block a user