suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0001079: Task Deadlock: Part Workbench disabled when closing Combo View with open Task

Browse Source
This commit is contained in:
wmayer 2013-04-03 16:43:10 +02:00
parent 0d62206bb5
commit bc7454349f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Gui/Control.cpp
View File

@ -105,6 +105,7 @@ void ControlSingleton::showDialog(Gui::TaskView::TaskDialog *dlg)
if (dw) { if (dw) {
dw->setVisible(true); dw->setVisible(true);
dw->toggleViewAction()->setVisible(true); dw->toggleViewAction()->setVisible(true);
dw->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
} }
if (ActiveDialog == dlg) if (ActiveDialog == dlg)
@ -159,6 +160,10 @@ void ControlSingleton::closedDialog()
// should return the pointer to combo view // should return the pointer to combo view
assert(pcCombiView); assert(pcCombiView);
pcCombiView->closedDialog(); pcCombiView->closedDialog();
// make sure that the combo view is shown
QDockWidget* dw = qobject_cast<QDockWidget*>(pcCombiView->parentWidget());
if (dw)
dw->setFeatures(QDockWidget::AllDockWidgetFeatures);
} }
bool ControlSingleton::isAllowedAlterDocument(void) const bool ControlSingleton::isAllowedAlterDocument(void) const
@ -203,5 +208,5 @@ void ControlSingleton::destruct (void)
// ------------------------------------------- // -------------------------------------------
#include "moc_Control.cpp" #include "moc_Control.cpp"