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

Remove nested margins in project panel wigets

Browse Source 
While maintaining the margins in the respective option pages.

Change-Id: Ia7c0e9f68ab196be0d68632117041eca9f4b15f5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Alessandro Portale
2021-12-01 20:31:08 +01:00
parent fd768cf55e
commit df1876f0d0
6 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/projectsettingswidget.cpp
View File

@@ -57,12 +57,14 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(ProjectExplorer::Project *p
, m_projectSettings(AutotestPlugin::projectSettings(project)) , m_projectSettings(AutotestPlugin::projectSettings(project))
{ {
auto verticalLayout = new QVBoxLayout(this); auto verticalLayout = new QVBoxLayout(this);
verticalLayout->setContentsMargins(0, 0, 0, 0);
m_useGlobalSettings = new QComboBox; m_useGlobalSettings = new QComboBox;
m_useGlobalSettings->addItem(tr("Global")); m_useGlobalSettings->addItem(tr("Global"));
m_useGlobalSettings->addItem(tr("Custom")); m_useGlobalSettings->addItem(tr("Custom"));
auto generalWidget = new QWidget; auto generalWidget = new QWidget;
auto groupBoxLayout = new QVBoxLayout; auto groupBoxLayout = new QVBoxLayout;
groupBoxLayout->setContentsMargins(0, 0, 0, 0);
m_activeFrameworks = new QTreeWidget; m_activeFrameworks = new QTreeWidget;
m_activeFrameworks->setHeaderHidden(true); m_activeFrameworks->setHeaderHidden(true);
m_activeFrameworks->setRootIsDecorated(false); m_activeFrameworks->setRootIsDecorated(false);

12
src/plugins/clangcodemodel/clangprojectsettingswidget.ui
View File

@@ -14,6 +14,18 @@
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>

12
src/plugins/clangtools/clangtoolsprojectsettingswidget.ui
View File

@@ -14,6 +14,18 @@
<string/> <string/>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>

2
src/plugins/cppeditor/cppcodemodelsettingspage.cpp
View File

@@ -245,6 +245,7 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
"If the document changes again while waiting, this timeout resets.\n")); "If the document changes again while waiting, this timeout resets.\n"));
const auto layout = new QVBoxLayout(this); const auto layout = new QVBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(&d->useClangdCheckBox); layout->addWidget(&d->useClangdCheckBox);
const auto formLayout = new QFormLayout; const auto formLayout = new QFormLayout;
const auto chooserLabel = new QLabel(tr("Path to executable:")); const auto chooserLabel = new QLabel(tr("Path to executable:"));
@@ -442,6 +443,7 @@ ClangdProjectSettingsWidget::ClangdProjectSettingsWidget(const ClangdProjectSett
: d(new Private(settings)) : d(new Private(settings))
{ {
const auto layout = new QVBoxLayout(this); const auto layout = new QVBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
const auto globalSettingsLayout = new QHBoxLayout; const auto globalSettingsLayout = new QHBoxLayout;
globalSettingsLayout->addWidget(&d->useGlobalSettingsCheckBox); globalSettingsLayout->addWidget(&d->useGlobalSettingsCheckBox);
const auto globalSettingsLabel = new QLabel("Use <a href=\"dummy\">global settings</a>"); const auto globalSettingsLabel = new QLabel("Use <a href=\"dummy\">global settings</a>");

2
src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp
View File

@@ -40,6 +40,8 @@ CppQuickFixProjectSettingsWidget::CppQuickFixProjectSettingsWidget(ProjectExplor
ui->setupUi(this); ui->setupUi(this);
m_settingsWidget = new CppEditor::Internal::CppQuickFixSettingsWidget(this); m_settingsWidget = new CppEditor::Internal::CppQuickFixSettingsWidget(this);
m_settingsWidget->loadSettings(m_projectSettings->getSettings()); m_settingsWidget->loadSettings(m_projectSettings->getSettings());
if (QLayout *layout = m_settingsWidget->layout())
layout->setContentsMargins(0, 0, 0, 0);
ui->layout->addWidget(m_settingsWidget); ui->layout->addWidget(m_settingsWidget);
connect(ui->comboBox, connect(ui->comboBox,
QOverload<int>::of(&QComboBox::currentIndexChanged), QOverload<int>::of(&QComboBox::currentIndexChanged),

12
src/plugins/cppeditor/cppquickfixprojectsettingswidget.ui
View File

@@ -11,6 +11,18 @@
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QPushButton" name="pushButton_custom"> <widget class="QPushButton" name="pushButton_custom">
<property name="text"> <property name="text">