kindred/create
1
1
Fork 0
Code Issues 47 Pull Requests Actions 4 Packages Projects 9 Releases 2 Wiki Activity

Avoid affecting other Tabs when Page deleted.

Browse Source 
- when Page object was deleted, closing the Page's
  tab would have undesired effect on 3D tab. Now Page
  delete does not affect other tabs.
This commit is contained in:
WandererFan
2018-02-12 10:12:10 -05:00
committed by Yorik van Havre
parent 978a02c9cb
commit 6b930016c8
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/TechDraw/Gui/ViewProviderPage.cpp
View File

@@ -119,6 +119,8 @@ void ViewProviderPage::show(void)
showMDIViewPage();
}
//this "hide" is only used for Visibility property toggle
//not when Page tab is closed.
void ViewProviderPage::hide(void)
{
if (!m_mdiView.isNull()) { //m_mdiView is a QPointer
@@ -169,18 +171,11 @@ void ViewProviderPage::updateData(const App::Property* prop)
bool ViewProviderPage::onDelete(const std::vector<std::string> &items)
{
bool rc = ViewProviderDocumentObject::onDelete(items);
if (!m_mdiView.isNull()) {
Gui::getMainWindow()->removeWindow(m_mdiView);
// Gui::getMainWindow()->activatePreviousWindow(); //changed for consistency. see comment in hide() above.
//note: doesn't fix problem here.
//3d view is still not maximized after page is deleted.
m_mdiView->deleteLater(); // Delete the drawing m_mdiView;
} else {
// MDIViewPage is not displayed yet so don't try to delete it!
Base::Console().Log("INFO - ViewProviderPage::onDelete - Page object deleted when viewer not displayed\n");
m_mdiView->deleteSelf();
}
Gui::Selection().clearSelection();
return ViewProviderDocumentObject::onDelete(items);
return rc;
}
void ViewProviderPage::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)