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

Core: Revert superfluous changes made with PR #9521

Browse Source
This commit is contained in:
wmayer
2023-10-08 03:01:40 +02:00
committed by wwmayer
parent 22aa20c9e0
commit d305f306df
84 changed files with 265 additions and 1884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/Gui/Tree.cpp
View File

@@ -66,10 +66,6 @@
#include "Widgets.h"
#include "Workbench.h"
#include <Base/DocumentReader.h>
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOM.hpp>
FC_LOG_LEVEL_INIT("Tree", false, true, true)
@@ -355,33 +351,6 @@ public:
}
reader.readEndElement("Expand", level - 1);
}
void restore(Base::DocumentReader& reader, XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *expandEl) {
const char* count_cstr = reader.GetAttribute(expandEl,"count");
if(count_cstr){
long count = reader.ContentToInt( count_cstr );
auto prev_ExpandDOM = reader.FindElement(expandEl,"Expand");
const char* name_cstr = reader.GetAttribute(prev_ExpandDOM,"name");
const char* _count_cstr = reader.GetAttribute(prev_ExpandDOM,"count");
auto& entry = (*this)[name_cstr];
if(_count_cstr){
entry.reset(new ExpandInfo);
entry->restore(reader,prev_ExpandDOM);
}
for (int i = 1; i < count; ++i) {
auto ExpandDOM_i = reader.FindNextElement(prev_ExpandDOM,"Expand");
const char* name_cstr = reader.GetAttribute(ExpandDOM_i,"name");
const char* _count_cstr = reader.GetAttribute(ExpandDOM_i,"count");
auto& entry = (*this)[name_cstr];
if(_count_cstr){
entry.reset(new ExpandInfo);
entry->restore(reader,ExpandDOM_i);
}
prev_ExpandDOM = ExpandDOM_i;
}
}
}
};
// ---------------------------------------------------------------------------
@@ -3982,21 +3951,6 @@ void DocumentItem::Restore(Base::XMLReader& reader) {
}
}
void DocumentItem::Restore(Base::DocumentReader& reader) {
auto expandEl = reader.FindElement("Expand");
if( !reader.GetAttribute(expandEl,"count") )
return;
_ExpandInfo.reset(new ExpandInfo);
_ExpandInfo->restore(reader,expandEl);
for (auto inst : TreeWidget::Instances) {
if (inst != getTree()) {
auto docItem = inst->getDocumentItem(document());
if (docItem)
docItem->_ExpandInfo = _ExpandInfo;
}
}
}
void DocumentItem::restoreItemExpansion(const ExpandInfoPtr& info, DocumentObjectItem* item) {
item->setExpanded(true);
if (!info)