From d010dbd190a45b28fc736abaef175f08a2bf790a Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sat, 2 Sep 2017 00:06:56 +0200 Subject: [PATCH 1/4] Welcome: Remove the big minimal height requirement The SideBar in the QtWidgets based Welcome mode had a high minimal height which cause whole Qt Creator not to fit on my HD(720) screen. This change wraps the SideBar into a vertical scroll area. Change-Id: I1d70ced1bbe803fb866159dd557a401c3ab6a9b2 Reviewed-by: hjk --- src/plugins/welcome/welcomeplugin.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index c7d6058012c..72823240ae3 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -289,6 +290,11 @@ WelcomeMode::WelcomeMode() m_modeWidget->setPalette(palette); m_sideBar = new SideBar(m_modeWidget); + auto scrollableSideBar = new QScrollArea(m_modeWidget); + scrollableSideBar->setWidget(m_sideBar); + scrollableSideBar->setWidgetResizable(true); + scrollableSideBar->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + scrollableSideBar->setFrameShape(QFrame::NoFrame); auto divider = new QWidget(m_modeWidget); divider->setMaximumWidth(1); @@ -300,7 +306,7 @@ WelcomeMode::WelcomeMode() m_pageStack->setAutoFillBackground(true); auto hbox = new QHBoxLayout; - hbox->addWidget(m_sideBar); + hbox->addWidget(scrollableSideBar); hbox->addWidget(divider); hbox->addWidget(m_pageStack); hbox->setStretchFactor(m_pageStack, 10); From ca3b882ab8e4fb49fabc8d606331c982bd541faf Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 5 Sep 2017 12:01:13 +0200 Subject: [PATCH 2/4] TextEditor: Fix painting with frame turned on When using our text editor in a normal panel, we want to turn on the frame again. Make sure that the extra text editor area does not overlap the frame, and also make sure that there is no extra area shown at all if all its features are turned off. This fixes the painting of the input fields in the Clang Query advanced search. Task-number: QTCREATORBUG-18815 Change-Id: Ie74f87ddc576c02cd5ea7650f2632fe91df143eb Reviewed-by: Marco Bubke Reviewed-by: Tim Jenssen --- src/plugins/texteditor/texteditor.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index d395656da66..06f02615eba 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -3370,7 +3370,8 @@ void TextEditorWidget::resizeEvent(QResizeEvent *e) QRect cr = rect(); d->m_extraArea->setGeometry( QStyle::visualRect(layoutDirection(), cr, - QRect(cr.left(), cr.top(), extraAreaWidth(), cr.height()))); + QRect(cr.left() + frameWidth(), cr.top() + frameWidth(), + extraAreaWidth(), cr.height() - 2 * frameWidth()))); d->adjustScrollBarRanges(); d->updateCurrentLineInScrollbar(); } @@ -4649,6 +4650,9 @@ int TextEditorWidget::extraAreaWidth(int *markWidthPtr) const if (!d->m_marksVisible && documentLayout->hasMarks) d->m_marksVisible = true; + if (!d->m_marksVisible && !d->m_lineNumbersVisible && !d->m_codeFoldingVisible) + return 0; + int space = 0; const QFontMetrics fm(d->m_extraArea->fontMetrics()); From b3814184760c3279047512bb5673c06b3b71073e Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 6 Sep 2017 08:55:03 +0200 Subject: [PATCH 3/4] Welcome: Squish: Assign object name to fix Squish tests Latest change of adding QScrollArea around Welcome's sidebar made the objects lookup fragile. Using the QScrollArea inside Squish tests helped for some but not all lookups. Simplify the lookup by assigning an object name. Change-Id: I5f37ee69bf20eaf02c9717cbaa5ba541d8ffbc17 Reviewed-by: Alessandro Portale --- src/plugins/welcome/welcomeplugin.cpp | 1 + tests/system/shared/welcome.py | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 72823240ae3..d0bde8e9946 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -303,6 +303,7 @@ WelcomeMode::WelcomeMode() divider->setPalette(themeColor(Theme::Welcome_DividerColor)); m_pageStack = new QStackedWidget(m_modeWidget); + m_pageStack->setObjectName("WelcomeScreenStackedWidget"); m_pageStack->setAutoFillBackground(true); auto hbox = new QHBoxLayout; diff --git a/tests/system/shared/welcome.py b/tests/system/shared/welcome.py index 406f379e030..0d6d446f6b3 100644 --- a/tests/system/shared/welcome.py +++ b/tests/system/shared/welcome.py @@ -37,10 +37,8 @@ def getWelcomeScreenSideBarButton(buttonLabel): return __getWelcomeScreenButtonHelper__(buttonLabel, sideBar) def getWelcomeScreenMainButton(buttonLabel): - stackedWidget = waitForObject("{type='QWidget' unnamed='1' visible='1' " - "leftWidget={type='QWidget' unnamed='1' visible='1' " - "leftWidget={type='Welcome::Internal::SideBar' unnamed='1' " - "window=':Qt Creator_Core::Internal::MainWindow'}}}") + stackedWidget = waitForObject("{type='QStackedWidget' name='WelcomeScreenStackedWidget' " + "window=':Qt Creator_Core::Internal::MainWindow'}") currentStackWidget = stackedWidget.currentWidget() return __getWelcomeScreenButtonHelper__(buttonLabel, currentStackWidget) From ff9e745e0faf3a0e321d7b585853007309e797a5 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 5 Sep 2017 22:33:30 +0300 Subject: [PATCH 4/4] Bump version to 4.4.1 Change-Id: Ib65ad133f580fe0cca76ea31752134343b986dd6 Reviewed-by: Eike Ziller --- qbs/modules/qtc/qtc.qbs | 4 ++-- qtcreator.pri | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index b5cc46cc0e6..9b8c3c68bb9 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,10 +4,10 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.4.0' + property string qtcreator_display_version: '4.4.1' property string ide_version_major: '4' property string ide_version_minor: '4' - property string ide_version_release: '0' + property string ide_version_release: '1' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release diff --git a/qtcreator.pri b/qtcreator.pri index 06f71bcba8a..a1dd1fe8078 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -1,10 +1,10 @@ !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included") QTCREATOR_PRI_INCLUDED = 1 -QTCREATOR_VERSION = 4.4.0 +QTCREATOR_VERSION = 4.4.1 QTCREATOR_COMPAT_VERSION = 4.4.0 VERSION = $$QTCREATOR_VERSION -QTCREATOR_DISPLAY_VERSION = 4.4.0 +QTCREATOR_DISPLAY_VERSION = 4.4.1 QTCREATOR_COPYRIGHT_YEAR = 2017 BINARY_ARTIFACTS_BRANCH = 4.4