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

[TD]Restore context menu after leader edit

Browse Source
This commit is contained in:
wandererfan
2019-08-13 16:12:17 -04:00
committed by WandererFan
parent 3c4700d05b
commit 5806fc64b9
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
View File

@@ -123,6 +123,7 @@ TaskLeaderLine::TaskLeaderLine(TechDrawGui::ViewProviderLeader* leadVP) :
saveState();
m_trackerMode = QGTracker::TrackerMode::Line;
m_saveContextPolicy = m_mdi->contextMenuPolicy();
}
//ctor for creation
@@ -165,6 +166,8 @@ TaskLeaderLine::TaskLeaderLine(TechDraw::DrawView* baseFeat,
ui->pbCancelEdit->setEnabled(false);
m_trackerMode = QGTracker::TrackerMode::Line;
m_saveContextPolicy = m_mdi->contextMenuPolicy();
}
TaskLeaderLine::~TaskLeaderLine()
@@ -648,12 +651,12 @@ bool TaskLeaderLine::accept()
// removeTracker();
createLeaderFeature(m_trackerPoints);
}
m_mdi->setContextMenuPolicy(m_saveContextPolicy);
m_trackerMode = QGTracker::TrackerMode::None;
removeTracker();
Gui::Command::doCommand(Gui::Command::Gui,"Gui.ActiveDocument.resetEdit()");
m_mdi->setContextMenuPolicy(m_saveContextPolicy);
return true;
}
@@ -670,9 +673,6 @@ bool TaskLeaderLine::reject()
Gui::Document* doc = Gui::Application::Instance->getDocument(m_basePage->getDocument());
if (!doc) return false;
if (m_mdi != nullptr) {
m_mdi->setContextMenuPolicy(m_saveContextPolicy);
}
if (getCreateMode() &&
(m_lineFeat != nullptr) ) {
removeFeature();
@@ -690,6 +690,10 @@ bool TaskLeaderLine::reject()
Gui::Command::doCommand(Gui::Command::Gui,"App.activeDocument().recompute()");
Gui::Command::doCommand(Gui::Command::Gui,"Gui.ActiveDocument.resetEdit()");
if (m_mdi != nullptr) {
m_mdi->setContextMenuPolicy(m_saveContextPolicy);
}
return false;
}

2
src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
View File

@@ -553,7 +553,7 @@ std::vector<App::DocumentObject*> TaskWeldingSymbol::createTiles(void)
std::vector<App::DocumentObject*> TaskWeldingSymbol::updateTiles(void)
{
Base::Console().Message("TWS::updateTiles()\n");
// Base::Console().Message("TWS::updateTiles()\n");
std::vector<App::DocumentObject*> tileFeats;
std::string tileType("TechDraw::DrawTileWeld");
std::string tileName;