electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #27937 from WandererFan/backport-27009-to-releases/FreeCAD-1-1

Browse Source 
Backport 27009 to releases/FreeCAD-1-1
This commit is contained in:
Yorik van Havre
2026-03-05 08:12:20 +00:00
committed by GitHub
parent 25cf782db8 def1a634c5
commit 0ea8fd5b05
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mod/TechDraw/Gui/CommandDecorate.cpp
+3 -6
View File
@@ -120,12 +120,9 @@ void CmdTechDrawToggleFrame::activated(int iMsg)
bool CmdTechDrawToggleFrame::isActive()
{
if (PreferencesGui::getViewFrameMode() != ViewFrameMode::Manual) {
return false;
}
auto mvp = dynamic_cast<MDIViewPage *>(Gui::getMainWindow()->activeWindow());
return mvp != nullptr;
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
return (havePage && haveView && PreferencesGui::getViewFrameMode() == ViewFrameMode::Manual);
}
//===========================================================================
src/Mod/TechDraw/Gui/MDIViewPage.cpp
+3 -1
View File
@@ -447,7 +447,9 @@ void MDIViewPage::contextMenuEvent(QContextMenuEvent* event)
menu.addAction(m_exportDXFAction);
menu.addAction(m_exportPDFAction);
menu.addAction(m_printAllAction);
if (PreferencesGui::getViewFrameMode() != ViewFrameMode::Manual) {
if (PreferencesGui::getViewFrameMode() == ViewFrameMode::Manual) {
m_toggleFrameAction->setEnabled(true);
} else {
m_toggleFrameAction->setEnabled(false);
}
menu.exec(event->globalPos());
src/Mod/TechDraw/Gui/QGIViewPart.cpp
+12 -2
View File
@@ -467,6 +467,7 @@ void QGIViewPart::drawAllVertexes()
// dvp and vp already validated
auto dvp(static_cast<TechDraw::DrawViewPart*>(getViewObject()));
auto vp(static_cast<ViewProviderViewPart*>(getViewProvider(getViewObject())));
ViewProviderPage* vpPage = vp->getViewProviderPage();
QColor vertexColor = PreferencesGui::getAccessibleQColor(PreferencesGui::vertexQColor());
const std::vector<TechDraw::VertexPtr>& verts = dvp->getVertexGeometry();
@@ -482,7 +483,8 @@ void QGIViewPart::drawAllVertexes()
cmItem->setZValue(ZVALUE::VERTEX);
bool showMark =
( (!isExporting() && vp->ArcCenterMarks.getValue()) ||
(isExporting() && Preferences::printCenterMarks()) );
(isExporting() && Preferences::printCenterMarks()) ||
(vpPage->getFrameState() && PreferencesGui::getViewFrameMode() == ViewFrameMode::Manual));
cmItem->setVisible(showMark);
} else {
//regular Vertex
@@ -495,7 +497,8 @@ void QGIViewPart::drawAllVertexes()
item->setRadius(getVertexSize());
item->setPrettyNormal();
item->setZValue(ZVALUE::VERTEX);
item->setVisible(m_isHovered || isSelected());
item->setVisible(m_isHovered || isSelected() ||
(vpPage->getFrameState() && PreferencesGui::getViewFrameMode() == ViewFrameMode::Manual));
}
}
}
@@ -1316,6 +1319,13 @@ void QGIViewPart::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
return;
}
auto vp(static_cast<ViewProviderViewPart*>(getViewProvider(getViewObject())));
ViewProviderPage* vpPage = vp->getViewProviderPage();
if (vpPage->getFrameState() &&
PreferencesGui::getViewFrameMode() == ViewFrameMode::Manual) {
return;
}
bool hideCenters = hideCenterMarks();
for (auto& child : childItems()) {