From abee2e0b0d9c537ced3e6f713e24d81c2890c93d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Fri, 10 Jul 2009 14:54:46 +0200
Subject: [PATCH] Made it possible to make Qt Creator smaller, based on scroll
areas
Scroll areas were added to the welcome mode and the project mode, to
make sure they don't limit how small Qt Creator can be made.
Done with mae
---
.../cmakeprojectmanager/cmakerunconfiguration.cpp | 2 +-
src/plugins/coreplugin/welcomemode.cpp | 9 ++++++++-
src/plugins/projectexplorer/projectwindow.cpp | 14 ++++++++++++--
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index ccbafba784f..ae30132b3bc 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -253,7 +253,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
fl->addRow(tr("Working Directory:"), boxlayout);
QGroupBox *box = new QGroupBox(tr("Environment"),this);
- QVBoxLayout *boxLayout = new QVBoxLayout();
+ QVBoxLayout *boxLayout = new QVBoxLayout;
box->setLayout(boxLayout);
box->setFlat(true);
diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index 03c83c74e74..e1489eba810 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/src/plugins/coreplugin/welcomemode.cpp
@@ -39,6 +39,7 @@
#include <QtGui/QToolBar>
#include <QtGui/QDesktopServices>
#include <QtGui/QMouseEvent>
+#include <QtGui/QScrollArea>
#include <QtCore/QDateTime>
#include <QtCore/QDir>
@@ -58,6 +59,7 @@ struct WelcomeModePrivate
{
WelcomeModePrivate();
+ QScrollArea *m_scrollArea;
QWidget *m_widget;
QWidget *m_welcomePage;
QButtonGroup *btnGrp;
@@ -140,6 +142,11 @@ WelcomeMode::WelcomeMode() :
m_d->ui.feedbackButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
l->addWidget(m_d->m_welcomePage);
+ m_d->m_scrollArea = new QScrollArea;
+ m_d->m_scrollArea->setFrameStyle(QFrame::NoFrame);
+ m_d->m_scrollArea->setWidget(m_d->m_widget);
+ m_d->m_scrollArea->setWidgetResizable(true);
+
updateWelcomePage(WelcomePageData());
m_d->btnGrp = new QButtonGroup(this);
@@ -229,7 +236,7 @@ int WelcomeMode::priority() const
QWidget* WelcomeMode::widget()
{
- return m_d->m_widget;
+ return m_d->m_scrollArea;
}
const char* WelcomeMode::uniqueModeName() const
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index b7d0612c279..504037661a5 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -45,6 +45,7 @@
#include <QtGui/QApplication>
#include <QtGui/QBoxLayout>
#include <QtGui/QComboBox>
+#include <QtGui/QScrollArea>
#include <QtGui/QTabWidget>
#include <QtGui/QToolBar>
#include <QtGui/QTreeWidget>
@@ -88,9 +89,18 @@ ProjectWindow::ProjectWindow(QWidget *parent)
m_panelsTabWidget->setDocumentMode(true);
QVBoxLayout *panelsLayout = new QVBoxLayout(panelsWidget);
+ QWidget *marginWidget = new QWidget;
+ QVBoxLayout *marginLayout = new QVBoxLayout(marginWidget);
+ marginLayout->setContentsMargins(0, panelsLayout->margin(), 0, 0);
+ marginLayout->addWidget(m_panelsTabWidget);
+
+ QScrollArea *scrollArea = new QScrollArea;
+ scrollArea->setWidgetResizable(true);
+ scrollArea->setFrameStyle(QFrame::NoFrame);
+ scrollArea->setWidget(marginWidget);
panelsLayout->setSpacing(0);
- panelsLayout->setContentsMargins(0, panelsLayout->margin(), 0, 0);
- panelsLayout->addWidget(m_panelsTabWidget);
+ panelsLayout->setMargin(0);
+ panelsLayout->addWidget(scrollArea);
QWidget *dummy = new QWidget;
QVBoxLayout *dummyLayout = new QVBoxLayout(dummy);
--
GitLab