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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I9620928b431cefa995a06db85ecfcb92f225f732
This commit is contained in:
Eike Ziller
2017-09-06 12:19:18 +02:00
parent a512c8e0c8 ff9e745e0f
commit c2ef4b52d3
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/texteditor/texteditor.cpp
View File

@@ -3370,7 +3370,8 @@ void TextEditorWidget::resizeEvent(QResizeEvent *e)
QRect cr = rect(); QRect cr = rect();
d->m_extraArea->setGeometry( d->m_extraArea->setGeometry(
QStyle::visualRect(layoutDirection(), cr, 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->adjustScrollBarRanges();
d->updateCurrentLineInScrollbar(); d->updateCurrentLineInScrollbar();
} }
@@ -4649,6 +4650,9 @@ int TextEditorWidget::extraAreaWidth(int *markWidthPtr) const
if (!d->m_marksVisible && documentLayout->hasMarks) if (!d->m_marksVisible && documentLayout->hasMarks)
d->m_marksVisible = true; d->m_marksVisible = true;
if (!d->m_marksVisible && !d->m_lineNumbersVisible && !d->m_codeFoldingVisible)
return 0;
int space = 0; int space = 0;
const QFontMetrics fm(d->m_extraArea->fontMetrics()); const QFontMetrics fm(d->m_extraArea->fontMetrics());

9
src/plugins/welcome/welcomeplugin.cpp
View File

@@ -52,6 +52,7 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <QOpenGLWidget> #include <QOpenGLWidget>
#include <QPainter> #include <QPainter>
#include <QScrollArea>
#include <QStackedWidget> #include <QStackedWidget>
#include <QTimer> #include <QTimer>
#include <QVBoxLayout> #include <QVBoxLayout>
@@ -292,6 +293,11 @@ WelcomeMode::WelcomeMode()
m_modeWidget->setPalette(palette); m_modeWidget->setPalette(palette);
m_sideBar = new SideBar(m_modeWidget); 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); auto divider = new QWidget(m_modeWidget);
divider->setMaximumWidth(1); divider->setMaximumWidth(1);
@@ -300,10 +306,11 @@ WelcomeMode::WelcomeMode()
divider->setPalette(themeColor(Theme::Welcome_DividerColor)); divider->setPalette(themeColor(Theme::Welcome_DividerColor));
m_pageStack = new QStackedWidget(m_modeWidget); m_pageStack = new QStackedWidget(m_modeWidget);
m_pageStack->setObjectName("WelcomeScreenStackedWidget");
m_pageStack->setAutoFillBackground(true); m_pageStack->setAutoFillBackground(true);
auto hbox = new QHBoxLayout; auto hbox = new QHBoxLayout;
hbox->addWidget(m_sideBar); hbox->addWidget(scrollableSideBar);
hbox->addWidget(divider); hbox->addWidget(divider);
hbox->addWidget(m_pageStack); hbox->addWidget(m_pageStack);
hbox->setStretchFactor(m_pageStack, 10); hbox->setStretchFactor(m_pageStack, 10);

6
tests/system/shared/welcome.py
View File

@@ -37,10 +37,8 @@ def getWelcomeScreenSideBarButton(buttonLabel):
return __getWelcomeScreenButtonHelper__(buttonLabel, sideBar) return __getWelcomeScreenButtonHelper__(buttonLabel, sideBar)
def getWelcomeScreenMainButton(buttonLabel): def getWelcomeScreenMainButton(buttonLabel):
stackedWidget = waitForObject("{type='QWidget' unnamed='1' visible='1' " stackedWidget = waitForObject("{type='QStackedWidget' name='WelcomeScreenStackedWidget' "
"leftWidget={type='QWidget' unnamed='1' visible='1' " "window=':Qt Creator_Core::Internal::MainWindow'}")
"leftWidget={type='Welcome::Internal::SideBar' unnamed='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}}}")
currentStackWidget = stackedWidget.currentWidget() currentStackWidget = stackedWidget.currentWidget()
return __getWelcomeScreenButtonHelper__(buttonLabel, currentStackWidget) return __getWelcomeScreenButtonHelper__(buttonLabel, currentStackWidget)