feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Layouting: Make aspects operate on parent items, not LayoutBuilder

Browse Source 
LayoutBuilder is meant to be an implementation detail nowadays.

Change-Id: I777ab934d3d405873e819eeddd27428d8c652f9a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2023-05-02 17:20:57 +02:00
parent 50084f6b0e
commit 99f7679564
40 changed files with 204 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -335,8 +335,8 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
Column {
Form {
buildDirAspect,
bc->aspect<BuildTypeAspect>(),
buildDirAspect, br,
bc->aspect<BuildTypeAspect>(), br,
qmlDebugAspect
},
m_warningMessageLabel,
@@ -347,7 +347,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildSystem *bs) :
Column {
cmakeConfiguration,
Row {
bc->aspect<InitialCMakeArgumentsAspect>(),
bc->aspect<InitialCMakeArgumentsAspect>(), br,
bc->aspect<AdditionalCMakeOptionsAspect>()
},
m_reconfigureButton,
@@ -665,17 +665,19 @@ void CMakeBuildSettingsWidget::kitCMakeConfiguration()
CMakeGeneratorKitAspect generatorAspect;
CMakeConfigurationKitAspect configurationKitAspect;
auto layout = new QGridLayout(dialog);
Layouting::Grid grid;
KitAspectWidget *widget = kitAspect.createConfigWidget(m_buildSystem->kit());
widget->setParent(dialog);
widget->addToLayoutWithLabel(layout->parentWidget());
widget->addToLayoutWithLabel(grid, dialog);
widget = generatorAspect.createConfigWidget(m_buildSystem->kit());
widget->setParent(dialog);
widget->addToLayoutWithLabel(layout->parentWidget());
widget->addToLayoutWithLabel(grid, dialog);
widget = configurationKitAspect.createConfigWidget(m_buildSystem->kit());
widget->setParent(dialog);
widget->addToLayoutWithLabel(layout->parentWidget());
widget->addToLayoutWithLabel(grid, dialog);
grid.attachTo(dialog);
auto layout = qobject_cast<QGridLayout *>(dialog->layout());
layout->setColumnStretch(1, 1);

14
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -105,7 +105,7 @@ private:
// KitAspectWidget interface
void makeReadOnly() override { m_comboBox->setEnabled(false); }
void addToLayout(LayoutBuilder &builder) override
void addToLayout(LayoutItem &builder) override
{
addMutableAction(m_comboBox);
builder.addItem(m_comboBox);
@@ -350,11 +350,11 @@ private:
// KitAspectWidget interface
void makeReadOnly() override { m_changeButton->setEnabled(false); }
void addToLayout(LayoutBuilder &builder) override
void addToLayout(LayoutItem &parent) override
{
addMutableAction(m_label);
builder.addItem(m_label);
builder.addItem(m_changeButton);
parent.addItem(m_label);
parent.addItem(m_changeButton);
}
void refresh() override
@@ -892,11 +892,11 @@ public:
private:
// KitAspectWidget interface
void addToLayout(LayoutBuilder &builder) override
void addToLayout(LayoutItem &parent) override
{
addMutableAction(m_summaryLabel);
builder.addItem(m_summaryLabel);
builder.addItem(m_manageButton);
parent.addItem(m_summaryLabel);
parent.addItem(m_manageButton);
}
void makeReadOnly() override