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

Merge remote-tracking branch 'origin/4.12' into qds-1.59

Browse Source 
Change-Id: I39a979aba39c735ab6885808b6371e5c8c02d37b
This commit is contained in:
Tim Jenssen
2020-04-22 09:32:07 +02:00
parent a35a9e72d9 677fdb78c1
commit dda945355f
182 changed files with 14405 additions and 7951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,22 +212,6 @@ void DesignModeWidget::disableWidgets()
m_isDisabled = true;
}
bool DesignModeWidget::eventFilter(QObject *obj, QEvent *event) // TODO
{
if (event->type() == QEvent::Hide) {
qDebug() << ">>> HIDE";
m_outputPaneDockWidget->toggleView(false);
return true;
} else if (event->type() == QEvent::Show) {
qDebug() << ">>> SHOW";
m_outputPaneDockWidget->toggleView(true);
return true;
} else {
// standard event processing
return QObject::eventFilter(obj, event);
}
}
void DesignModeWidget::setup()
{
auto &actionManager = viewManager().designerActionManager();
@@ -376,7 +360,8 @@ void DesignModeWidget::setup()
command->setAttribute(Core::Command::CA_Hide);
mviews->addAction(command);
//outputPanePlaceholder->installEventFilter(this);
connect(outputPanePlaceholder, &Core::OutputPanePlaceHolder::visibilityChangeRequested,
m_outputPaneDockWidget, &ADS::DockWidget::toggleView);
}
// Create toolbars