--- a/idlehomescreen/xmluirendering/uiengine/src/xnviewcontroladapter.cpp Wed Sep 15 12:00:00 2010 +0300
+++ b/idlehomescreen/xmluirendering/uiengine/src/xnviewcontroladapter.cpp Wed Oct 13 14:18:30 2010 +0300
@@ -23,9 +23,9 @@
#include "xnnodepluginif.h"
#include "xnnode.h"
+#include "xndomdocument.h"
#include "xndomnode.h"
#include "xnproperty.h"
-#include "xnviewswitcher.h"
#include "xnviewcontroladapter.h"
@@ -73,7 +73,7 @@
//
CXnViewControlAdapter* CXnViewControlAdapter::NewL( CXnNodePluginIf& aNode )
{
- CXnViewControlAdapter* self = new( ELeave ) CXnViewControlAdapter();
+ CXnViewControlAdapter* self = new( ELeave ) CXnViewControlAdapter( aNode );
CleanupStack::PushL( self );
self->ConstructL( aNode );
@@ -126,8 +126,8 @@
// C++ default constructor
// -----------------------------------------------------------------------------
//
-CXnViewControlAdapter::CXnViewControlAdapter() :
- iAppUi( static_cast< CXnAppUiAdapter& >( *iAvkonAppUi ) )
+CXnViewControlAdapter::CXnViewControlAdapter( CXnNodePluginIf& aNode )
+ : iNode( aNode ), iAppUi( static_cast< CXnAppUiAdapter& >( *iAvkonAppUi ) )
{
}
@@ -187,18 +187,9 @@
//
void CXnViewControlAdapter::HandlePointerEventL(
const TPointerEvent& aPointerEvent )
- {
- if ( iForegroundStatus != EBackground &&
- ( iAppUi.UiEngine().IsPartialInputActive() || // no swipe if partial input active
- IsWidgetGestureDest() || // no swipe if widget handles it
- iAppUi.ViewSwitcher() == NULL || // no swipe if VS not available
- !iAppUi.ViewSwitcher()->ProcessPointerEventL( aPointerEvent ) ) ) // no swipe if event not handled by VS
+ {
+ if ( iForegroundStatus != EBackground )
{
- if ( IsWidgetGestureDest() && iAppUi.ViewSwitcher() != NULL )
- {
- iAppUi.ViewSwitcher()->StopViewSwitchL();
- }
-
iAppUi.UiEngine().DisableRenderUiLC();
CXnControlAdapter::HandlePointerEventL( aPointerEvent );