i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only mark a compound child hidden if it is in fact the only child present.

Browse Source 
Interesting side effects otherwise occur in the case where multiple compound
children are present, since other areas of the table model depend on the node
only being hidden in the single child case.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42367 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent
2011-07-04 02:34:08 +00:00
parent 3f1b2f48aa
commit 002d5e9729
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
+8 -5
View File
@@ -392,7 +392,8 @@ private:
status_t _AddNode(Variable* variable, ModelNode* parent,
ValueNodeChild* nodeChild,
bool isPresentationNode = false);
bool isPresentationNode = false,
bool isOnlyChild = false);
void _AddNode(Variable* variable);
status_t _CreateValueNode(ValueNodeChild* nodeChild);
status_t _AddChildNodes(ValueNodeChild* nodeChild);
@@ -819,7 +820,7 @@ VariablesView::VariableTableModel::ValueNodeChildrenCreated(
ValueNodeChild* child = valueNode->ChildAt(i);
if (fNodeTable.Lookup(child) == NULL) {
_AddNode(modelNode->GetVariable(), modelNode, child,
child->IsInternal());
child->IsInternal(), childCount == 1);
}
}
}
@@ -1003,7 +1004,8 @@ VariablesView::VariableTableModel::NotifyNodeChanged(ModelNode* node)
status_t
VariablesView::VariableTableModel::_AddNode(Variable* variable,
ModelNode* parent, ValueNodeChild* nodeChild, bool isPresentationNode)
ModelNode* parent, ValueNodeChild* nodeChild, bool isPresentationNode,
bool isOnlyChild)
{
// Don't create nodes for unspecified types -- we can't get/show their
// value anyway.
@@ -1036,8 +1038,9 @@ VariablesView::VariableTableModel::_AddNode(Variable* variable,
fNodeTable.Insert(node);
// mark a compound type child of a address type parent hidden
if (parent != NULL) {
// if an address type node has only a single child, and that child
// is a compound type, mark it hidden
if (isOnlyChild && parent != NULL) {
ValueNode* parentValueNode = parent->NodeChild()->Node();
if (parentValueNode != NULL
&& parentValueNode->GetType()->ResolveRawType(false)->Kind()