--- a/uiacceltk/hitchcock/ServerCore/Src/alfhierarchymodel.cpp Mon Mar 15 12:43:37 2010 +0200
+++ b/uiacceltk/hitchcock/ServerCore/Src/alfhierarchymodel.cpp Wed Mar 31 23:03:58 2010 +0300
@@ -797,7 +797,12 @@
AMT_INC_COUNTER_IF(node && (nodeType==MWsWindowTreeNode::EWinTreeNodeClient), iWindowNodeCount );
AMT_INC_COUNTER_IF(node && (nodeType==MWsWindowTreeNode::EWinTreeNodeGroup), iWindowGroupNodeCount );
- AMT_INC_COUNTER_IF(node, iTotalNodeCount );
+ AMT_INC_COUNTER_IF(node, iTotalNodeCount );
+
+ AMT_MAP_INC_VALUE_IF( node && nodeType == MWsWindowTreeNode::EWinTreeNodeClient,
+ iIntMap, node->iId, EAlfModuleTestTypeHierarchyModelCreateWindow );
+ AMT_MAP_INC_VALUE_IF( node && nodeType == MWsWindowTreeNode::EWinTreeNodeGroup,
+ iIntMap, node->iId, EAlfModuleTestTypeHierarchyModelCreateWindowGroup );
}
// ---------------------------------------------------------------------------
@@ -830,7 +835,12 @@
AMT_DEC_COUNTER_IF(node && (nodeType==MWsWindowTreeNode::EWinTreeNodeClient), iWindowNodeCount );
AMT_DEC_COUNTER_IF(node && (nodeType==MWsWindowTreeNode::EWinTreeNodeGroup), iWindowGroupNodeCount );
- AMT_DEC_COUNTER_IF(node, iTotalNodeCount );
+ AMT_DEC_COUNTER_IF(node, iTotalNodeCount );
+
+ AMT_MAP_INC_VALUE_IF( node && nodeType == MWsWindowTreeNode::EWinTreeNodeClient,
+ iIntMap, nodeId, EAlfModuleTestTypeHierarchyModelReleaseWindow );
+ AMT_MAP_INC_VALUE_IF( node && nodeType == MWsWindowTreeNode::EWinTreeNodeGroup,
+ iIntMap, nodeId, EAlfModuleTestTypeHierarchyModelReleaseWindowGroup );
}
// ---------------------------------------------------------------------------
@@ -851,7 +861,11 @@
USER_INVARIANT();
}
- AMT_INC_COUNTER_IF( node && (nodeType==MWsWindowTreeNode::EWinTreeNodeClient), iWindowNodeActivatedCount );
+ AMT_INC_COUNTER_IF( node && (nodeType==MWsWindowTreeNode::EWinTreeNodeClient), iWindowNodeActivatedCount );
+
+ AMT_MAP_SET_VALUE_IF( node && nodeType == MWsWindowTreeNode::EWinTreeNodeClient,
+ iBoolMap, nodeId, ETrue,
+ EAlfModuleTestTypeHierarchyModelActiveWindow );
}
// ---------------------------------------------------------------------------
@@ -884,12 +898,12 @@
AMT_INC_COUNTER_IF(node, iNodeExtentChangedCount );
AMT_SET_VALUE_IF(node, iLatestNodeExtentRect, rect );
- AMT_MAP_SET_VALUE_IF( ( node && node->iWindow ),
+ AMT_MAP_SET_VALUE_IF( node && node->iWindow,
iSizeMap, node->iWindow->WsInfo().iClientSideId.iWindowIdentifer,
- rect.Size(), EAlfModuleTestTypeHierarchyModelChangeSize );
- AMT_MAP_SET_VALUE_IF( ( node && node->iWindow ),
+ rect.Size(), EAlfModuleTestTypeHierarchyModelChangeWindowSize );
+ AMT_MAP_SET_VALUE_IF( node && node->iWindow,
iPositionMap, node->iWindow->WsInfo().iClientSideId.iWindowIdentifer,
- rect.iTl, EAlfModuleTestTypeHierarchyModelChangePosition );
+ rect.iTl, EAlfModuleTestTypeHierarchyModelChangeWindowPosition );
}
// ---------------------------------------------------------------------------
@@ -951,9 +965,11 @@
}
AMT_INC_COUNTER_IF(node, iTotalNodeFlagChangedCount );
- AMT_MAP_INC_VALUE_IF( ( node && node->iWindow ),
- iIntMap, node->iWindow->WsInfo().iClientSideId.iWindowIdentifer,
- EAlfModuleTestTypeHierarchyModelChangeFlag );
+ AMT_MAP_SET_VALUE_IF( node && node->iWindow && MWsWindowTreeObserver::EVisible == flag,
+ iBoolMap,
+ node->iWindow->WsInfo().iClientSideId.iWindowIdentifer,
+ newValue,
+ EAlfModuleTestTypeHierarchyModelChangeWindowVisibility );
}
// ---------------------------------------------------------------------------
@@ -1152,7 +1168,7 @@
USER_INVARIANT(); // attribute change for unexpected node type. new code needed!
}
- AMT_INC_COUNTER_IF(node, iTotalNodeAttributeChangedCount );
+ AMT_INC_COUNTER_IF(node, iTotalNodeAttributeChangedCount );
}
// ---------------------------------------------------------------------------