From 195b17979de5d4f149756d95af19c96bdcc64a58 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Wed, 17 Mar 2010 14:36:09 +0100
Subject: [PATCH] More layout fixes
- Cleaned up frames in the QML inspactor.
- Do not force toolbar height for designer widgets
---
src/plugins/coreplugin/manhattanstyle.cpp | 2 +-
src/plugins/qmlinspector/components/expressionquerywidget.cpp | 1 +
src/plugins/qmlinspector/components/objectpropertiesview.cpp | 1 +
src/plugins/qmlinspector/components/objecttree.cpp | 1 +
src/plugins/qmlinspector/components/watchtable.cpp | 1 +
src/plugins/qmlinspector/inspectoroutputwidget.cpp | 2 +-
6 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 10415187592..8260afa3b32 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -275,7 +275,7 @@ void ManhattanStyle::polish(QWidget *widget)
}
else if (qobject_cast<QLabel*>(widget))
widget->setPalette(panelPalette(widget->palette()));
- else if (qobject_cast<QToolBar*>(widget) || widget->property("panelwidget_singlerow").toBool())
+ else if (widget->property("panelwidget_singlerow").toBool())
widget->setFixedHeight(Utils::StyleHelper::navigationWidgetHeight());
else if (qobject_cast<QStatusBar*>(widget))
widget->setFixedHeight(Utils::StyleHelper::navigationWidgetHeight() + 2);
diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.cpp b/src/plugins/qmlinspector/components/expressionquerywidget.cpp
index 92935fdd74a..2a9c5d242c2 100644
--- a/src/plugins/qmlinspector/components/expressionquerywidget.cpp
+++ b/src/plugins/qmlinspector/components/expressionquerywidget.cpp
@@ -66,6 +66,7 @@ ExpressionQueryWidget::ExpressionQueryWidget(Mode mode, QDeclarativeEngineDebug
layout->setMargin(0);
layout->setSpacing(0);
layout->addWidget(m_textEdit);
+ m_textEdit->setFrameStyle(QFrame::NoFrame);
updateTitle();
diff --git a/src/plugins/qmlinspector/components/objectpropertiesview.cpp b/src/plugins/qmlinspector/components/objectpropertiesview.cpp
index eff1a699e57..3420601483f 100644
--- a/src/plugins/qmlinspector/components/objectpropertiesview.cpp
+++ b/src/plugins/qmlinspector/components/objectpropertiesview.cpp
@@ -75,6 +75,7 @@ ObjectPropertiesView::ObjectPropertiesView(QDeclarativeEngineDebug *client, QWid
setLayout(layout);
m_tree = new QTreeWidget(this);
+ m_tree->setFrameStyle(QFrame::NoFrame);
m_tree->setAlternatingRowColors(true);
m_tree->setExpandsOnDoubleClick(false);
m_tree->setHeaderLabels(QStringList()
diff --git a/src/plugins/qmlinspector/components/objecttree.cpp b/src/plugins/qmlinspector/components/objecttree.cpp
index 39ba6d943df..c65da984b19 100644
--- a/src/plugins/qmlinspector/components/objecttree.cpp
+++ b/src/plugins/qmlinspector/components/objecttree.cpp
@@ -45,6 +45,7 @@ ObjectTree::ObjectTree(QDeclarativeEngineDebug *client, QWidget *parent)
m_client(client),
m_query(0)
{
+ setFrameStyle(QFrame::NoFrame);
setHeaderHidden(true);
setMinimumWidth(250);
setExpandsOnDoubleClick(false);
diff --git a/src/plugins/qmlinspector/components/watchtable.cpp b/src/plugins/qmlinspector/components/watchtable.cpp
index dfed5c676ba..0f7a2690075 100644
--- a/src/plugins/qmlinspector/components/watchtable.cpp
+++ b/src/plugins/qmlinspector/components/watchtable.cpp
@@ -276,6 +276,7 @@ WatchTableView::WatchTableView(WatchTableModel *model, QWidget *parent)
: QTableView(parent),
m_model(model)
{
+ setFrameStyle(QFrame::NoFrame);
setAlternatingRowColors(true);
connect(model, SIGNAL(watchCreated(QDeclarativeDebugWatch*)), SLOT(watchCreated(QDeclarativeDebugWatch*)));
diff --git a/src/plugins/qmlinspector/inspectoroutputwidget.cpp b/src/plugins/qmlinspector/inspectoroutputwidget.cpp
index a8d87aa34d5..364ec4adc08 100644
--- a/src/plugins/qmlinspector/inspectoroutputwidget.cpp
+++ b/src/plugins/qmlinspector/inspectoroutputwidget.cpp
@@ -41,7 +41,7 @@ InspectorOutputWidget::InspectorOutputWidget(QWidget *parent)
: QTextEdit(parent)
{
setWindowTitle(tr("Output"));
-
+ setFrameStyle(QFrame::NoFrame);
m_clearContents = new QAction(QString(tr("Clear")), this);
m_clearContents->setIcon(QIcon(Core::Constants::ICON_CLEAR));
connect(m_clearContents, SIGNAL(triggered()), SLOT(clear()));
--
GitLab