From 2ffa843d404f47693325b7da0f887722f1f114dd Mon Sep 17 00:00:00 2001 From: Artem Sokolovskii Date: Thu, 15 Dec 2022 12:54:18 +0100 Subject: [PATCH] ClangFormat: Make clang format checks widget resizable - Change Form to Grid that looks consistent for different OS Change-Id: Ibb5fc3564d8c25457c4bf520acf78b25c542b5ae Reviewed-by: Marcus Tillmanns Reviewed-by: Christian Kandeler --- scripts/generateClangFormatChecksLayout.py | 4 ++-- src/plugins/clangformat/clangformatchecks.cpp | 2 +- src/plugins/clangformat/clangformatconfigwidget.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/generateClangFormatChecksLayout.py b/scripts/generateClangFormatChecksLayout.py index 53bb85d99c4..f29743d5665 100755 --- a/scripts/generateClangFormatChecksLayout.py +++ b/scripts/generateClangFormatChecksLayout.py @@ -8,7 +8,7 @@ import os import CppHeaderParser def parse_arguments(): - parser = argparse.ArgumentParser(description='Clazy checks header file \ + parser = argparse.ArgumentParser(description='Clang-Format checks header file \ generator') parser.add_argument('--clang-format-header-file', help='path to \ Format.h usually /usr/lib/llvm-x/include/clang/Format/Format.h', @@ -80,7 +80,7 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent) ''' + source_code + ''' using namespace Layouting; - Form { + Grid { ''' + layout_code + ''' }.attachTo(this); } ''' diff --git a/src/plugins/clangformat/clangformatchecks.cpp b/src/plugins/clangformat/clangformatchecks.cpp index 83e50e08ec0..41af2fbbb36 100644 --- a/src/plugins/clangformat/clangformatchecks.cpp +++ b/src/plugins/clangformat/clangformatchecks.cpp @@ -695,7 +695,7 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent) using namespace Layouting; - Form { + Grid { new QLabel("BasedOnStyle"), m_BasedOnStyle, br, new QLabel("InheritsParentConfig"), m_InheritsParentConfig, br, new QLabel("AccessModifierOffset"), Row {m_AccessModifierOffset, m_setAccessModifierOffset}, br, diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp index f11e5939b66..18c11dcf5de 100644 --- a/src/plugins/clangformat/clangformatconfigwidget.cpp +++ b/src/plugins/clangformat/clangformatconfigwidget.cpp @@ -73,7 +73,7 @@ ClangFormatConfigWidget::ClangFormatConfigWidget(TextEditor::ICodeStylePreferenc m_checksWidget = new ClangFormatChecks(); m_checksScrollArea->setWidget(m_checksWidget); - m_checksScrollArea->setMaximumWidth(600); + m_checksScrollArea->setWidgetResizable(true); m_checksWidget->setEnabled(!codeStyle->isReadOnly()); FilePath fileName;