# HG changeset patch # User hgs # Date 1285674028 -10800 # Node ID 57d26d31c59548753424e63e8b610b2132551abc # Parent 5ba07f7750a99c53a2cd3f08c53da6ab8bc64542 201037 diff -r 5ba07f7750a9 -r 57d26d31c595 layers.sysdef.xml --- a/layers.sysdef.xml Thu Sep 02 13:30:25 2010 +0300 +++ b/layers.sysdef.xml Tue Sep 28 14:40:28 2010 +0300 @@ -12,10 +12,14 @@ + + + \ No newline at end of file diff -r 5ba07f7750a9 -r 57d26d31c595 uiacceltk/hitchcock/ServerCore/Inc/alfnodes.h --- a/uiacceltk/hitchcock/ServerCore/Inc/alfnodes.h Thu Sep 02 13:30:25 2010 +0300 +++ b/uiacceltk/hitchcock/ServerCore/Inc/alfnodes.h Tue Sep 28 14:40:28 2010 +0300 @@ -228,6 +228,11 @@ void Debug_CheckSiblingOrder(const TDesC16& aContext); #endif + /** + * Oprhans aNode and all its siblings. + */ + static void OrphanAll(CAlfNode* aNode); + public: // Data CAlfNode* iParent; diff -r 5ba07f7750a9 -r 57d26d31c595 uiacceltk/hitchcock/ServerCore/Src/alfhierarchymodel.cpp --- a/uiacceltk/hitchcock/ServerCore/Src/alfhierarchymodel.cpp Thu Sep 02 13:30:25 2010 +0300 +++ b/uiacceltk/hitchcock/ServerCore/Src/alfhierarchymodel.cpp Tue Sep 28 14:40:28 2010 +0300 @@ -1070,7 +1070,7 @@ // SetLayerUsesAplhaFlag is not supported for image visual node->Window()->SetLayerUsesAplhaFlag( enabled ); #ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS - node->Window()->SetTransparencyAlphaChannel( enabled ); + node->FlagChanged(MWsWindowTreeObserver::EAlphaChannelTransparencyEnabled, enabled); #endif // #ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS } else if( node ) // this would mean that node has being orphaneded but not yet deleted diff -r 5ba07f7750a9 -r 57d26d31c595 uiacceltk/hitchcock/ServerCore/Src/alfnodes.cpp --- a/uiacceltk/hitchcock/ServerCore/Src/alfnodes.cpp Thu Sep 02 13:30:25 2010 +0300 +++ b/uiacceltk/hitchcock/ServerCore/Src/alfnodes.cpp Tue Sep 28 14:40:28 2010 +0300 @@ -1246,12 +1246,18 @@ } // Orphan all the children - CAlfNode* child = iChild; - while( child ) - { - child = child->OrphanMe(); - } + OrphanAll(iChild); iChild = NULL; + + OrphanAll(iAnimChild); + iAnimChild = NULL; + + OrphanAll(iSpriteChild); + iSpriteChild = NULL; + + OrphanAll(iTextCursor); + iTextCursor = NULL; + if ( iModel ) { iModel->RemoveNode( iId ); @@ -1353,6 +1359,18 @@ } // --------------------------------------------------------------------------- +// OrphanAll +// --------------------------------------------------------------------------- +// +void CAlfNode::OrphanAll(CAlfNode* aNode) + { + while (aNode) + { + aNode = aNode->OrphanMe(); + } + } + +// --------------------------------------------------------------------------- // CommitCommandsL // --------------------------------------------------------------------------- // diff -r 5ba07f7750a9 -r 57d26d31c595 uiacceltk/hitchcock/goommonitor/src/goomlog.cpp --- a/uiacceltk/hitchcock/goommonitor/src/goomlog.cpp Thu Sep 02 13:30:25 2010 +0300 +++ b/uiacceltk/hitchcock/goommonitor/src/goomlog.cpp Tue Sep 28 14:40:28 2010 +0300 @@ -18,6 +18,7 @@ #ifdef _DEBUG +#include #include #include #include