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

QmlDesigner: move outputPlaceholder to the bottom

Browse Source 
Change-Id: Id4b3e47b513bcd9097ff884d7cc9a647715e2734
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2017-01-23 17:36:58 +01:00
committed by Thomas Hartmann
parent 7d63c3b899
commit 97a0d62c8e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmldesigner/designmodewidget.cpp
View File

@@ -484,8 +484,6 @@ static Core::MiniSplitter *createCentralSplitter(const QList<WidgetInfo> &widget
outputPlaceholderSplitter->setStretchFactor(1, 0); outputPlaceholderSplitter->setStretchFactor(1, 0);
outputPlaceholderSplitter->setOrientation(Qt::Vertical); outputPlaceholderSplitter->setOrientation(Qt::Vertical);
auto outputPanePlaceholder = new Core::OutputPanePlaceHolder(Core::Constants::MODE_DESIGN, outputPlaceholderSplitter);
QTabWidget* tabWidget = createWidgetsInTabWidget(centralWidgetInfos); QTabWidget* tabWidget = createWidgetsInTabWidget(centralWidgetInfos);
tabWidget->setObjectName("centralTabWidget"); tabWidget->setObjectName("centralTabWidget");
tabWidget->setTabPosition(QTabWidget::East); tabWidget->setTabPosition(QTabWidget::East);
@@ -502,6 +500,12 @@ static Core::MiniSplitter *createCentralSplitter(const QList<WidgetInfo> &widget
backgroundWidget->setStyleSheet(Theming::replaceCssColors(QString::fromUtf8(sheet))); backgroundWidget->setStyleSheet(Theming::replaceCssColors(QString::fromUtf8(sheet)));
outputPlaceholderSplitter->addWidget(backgroundWidget); outputPlaceholderSplitter->addWidget(backgroundWidget);
QWidget *bottomSideBar = createbottomSideBarWidget(widgetInfos);
bottomSideBar->setObjectName("bottomSideBar");
outputPlaceholderSplitter->addWidget(bottomSideBar);
auto outputPanePlaceholder = new Core::OutputPanePlaceHolder(Core::Constants::MODE_DESIGN, outputPlaceholderSplitter);
outputPlaceholderSplitter->addWidget(outputPanePlaceholder); outputPlaceholderSplitter->addWidget(outputPanePlaceholder);
return outputPlaceholderSplitter; return outputPlaceholderSplitter;
@@ -521,11 +525,10 @@ QWidget *DesignModeWidget::createCenterWidget()
Core::MiniSplitter *centralSplitter = createCentralSplitter(viewManager().widgetInfos()); Core::MiniSplitter *centralSplitter = createCentralSplitter(viewManager().widgetInfos());
m_centralTabWidget = centralSplitter->findChild<QTabWidget*>("centralTabWidget"); m_centralTabWidget = centralSplitter->findChild<QTabWidget*>("centralTabWidget");
Q_ASSERT(m_centralTabWidget); Q_ASSERT(m_centralTabWidget);
m_bottomSideBar = centralSplitter->findChild<QWidget*>("bottomSideBar");
Q_ASSERT(m_bottomSideBar);
horizontalLayout->addWidget(centralSplitter); horizontalLayout->addWidget(centralSplitter);
m_bottomSideBar = createbottomSideBarWidget(viewManager().widgetInfos());
horizontalLayout->addWidget(m_bottomSideBar.data());
return centerWidget; return centerWidget;
} }