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

Revert "Merge pull request #4626 from pavltom/GUI_TreeView_Item_Ordering"

Browse Source 
This reverts commit b0452667c72f330323f6b3366f45bf039d05feef, reversing
changes made to b2d99f3fa7b4c7c305aed4a8d975a8624a6d590f.

See forums discussion: https://forum.freecadweb.org/viewtopic.php?p=549120
This commit is contained in:
Chris Hennes
2021-11-24 09:03:35 -06:00
parent 86fd4f5152
commit ded7adb798
16 changed files with 22 additions and 826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Gui/ViewProviderDocumentObject.cpp
View File

@@ -66,8 +66,6 @@ FC_LOG_LEVEL_INIT("Gui",true,true)
using namespace Gui;
int ViewProviderDocumentObject::lastTreeRank = 0;
PROPERTY_SOURCE(Gui::ViewProviderDocumentObject, Gui::ViewProvider)
ViewProviderDocumentObject::ViewProviderDocumentObject()
@@ -92,8 +90,6 @@ ViewProviderDocumentObject::ViewProviderDocumentObject()
"Element: On top only if some sub-element of the object is selected");
OnTopWhenSelected.setEnums(OnTopEnum);
ADD_PROPERTY_TYPE(TreeRank, (0), dogroup, App::PropertyType(App::Prop_Hidden|App::Prop_NoPersist), "Tree view item ordering key");
sPixmap = "Feature";
}
@@ -226,14 +222,6 @@ void ViewProviderDocumentObject::onChanged(const App::Property* prop)
? SoFCSelectionRoot::Box : SoFCSelectionRoot::Full;
}
}
else if (prop == &TreeRank) {
if (this->TreeRank.getValue() <= 0) {
this->TreeRank.setValue(++ViewProviderDocumentObject::lastTreeRank);
}
else if (this->TreeRank.getValue() > ViewProviderDocumentObject::lastTreeRank) {
ViewProviderDocumentObject::lastTreeRank = this->TreeRank.getValue();
}
}
if (prop && !prop->testStatus(App::Property::NoModify)
&& pcDocument
@@ -690,15 +678,3 @@ std::string ViewProviderDocumentObject::getFullName() const {
return pcObject->getFullName() + ".ViewObject";
return std::string("?");
}
bool ViewProviderDocumentObject::allowTreeOrderSwap(const App::DocumentObject *child1, const App::DocumentObject *child2) const
{
std::vector<ViewProviderExtension *> extensions = getExtensionsDerivedFromType<ViewProviderExtension>();
for (ViewProviderExtension *ext : extensions) {
if (!ext->extensionAllowTreeOrderSwap(child1, child2)) {
return false;
}
}
return true;
}