summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2012-11-23 10:04:00 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-23 13:56:27 +0100
commit5e4bc7e3556cb5afcd82731277bdef60ae2cbe33 (patch)
tree4039190a6b66073fe9a1350b7dd1fa3cb139c303
parente38ee135f3cf74f413dc7a3e4a9f97a6b5d903bf (diff)
downloadqttools-5e4bc7e3556cb5afcd82731277bdef60ae2cbe33.tar.gz
Detect QMainWindow-separator as passive interactor in Qt Designer.
Ensure that dock widgets in Qt Creator can be resized. Task-number: QTCREATORBUG-8284 Change-Id: If6aa55b2dde8fce53e1527db678f518b3912907b Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
-rw-r--r--src/designer/src/lib/shared/widgetfactory.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp
index d8bf16a45..dd03e2a6f 100644
--- a/src/designer/src/lib/shared/widgetfactory.cpp
+++ b/src/designer/src/lib/shared/widgetfactory.cpp
@@ -802,6 +802,7 @@ static bool isTabBarInteractor(const QTabBar *tabBar)
bool WidgetFactory::isPassiveInteractor(QWidget *widget)
{
static const QString qtPassive = QStringLiteral("__qt__passive_");
+ static const QString qtMainWindowSplitter = QStringLiteral("qt_qmainwindow_extended_splitter");
if (m_lastPassiveInteractor != 0 && (QWidget*)(*m_lastPassiveInteractor) == widget)
return m_lastWasAPassiveInteractor;
@@ -842,8 +843,11 @@ bool WidgetFactory::isPassiveInteractor(QWidget *widget)
return (m_lastWasAPassiveInteractor = true);
else if (qstrcmp(widget->metaObject()->className(), "QWorkspaceTitleBar") == 0)
return (m_lastWasAPassiveInteractor = true);
- else if (widget->objectName().startsWith(qtPassive))
- return (m_lastWasAPassiveInteractor = true);
+ const QString name = widget->objectName();
+ if (name.startsWith(qtPassive) || name == qtMainWindowSplitter) {
+ m_lastWasAPassiveInteractor = true;
+ return m_lastWasAPassiveInteractor;
+ }
return m_lastWasAPassiveInteractor;
}