FCL/sf/app/homescreen: comparison idlehomescreen/xmluirendering/uiengine/src/xncontroladapterimpl.cpp

equal deleted inserted replaced

-:b8fae6b8a148
+:d05a55b217df
 #include "xndomnode.h"
 #include "xnproperty.h"
 #include "xndomlist.h"
 #include "xnodt.h"
 #include "xnresource.h"
-#include "xnhittest.h"
 #include "xnplugindata.h"
 #include "xnnode.h"
 #include "xnpanic.h"
 #include "xnviewdata.h"
 #include "xnscrollablecontroladapter.h"
 #include "xnfocuscontrol.h"
 #include "xneditmode.h"
 _LIT8(KScrollableBoxNodeName, "scrollablebox");
-using namespace XnGestureHelper;
-#include "xngesture.h"
 // Constants
 const TInt KSkinGfxInnerRectShrink = 5;
 const TInt KFocusGrowValue = 3;
 const TInt KLongTapStartShortDelay( 150000 ); // 0.15s for Sk
 const TInt KLongTapStartLongDelay( 500000 ); // 0.5s
 const TInt KLongTapTimeShortDelay( 600000 ); // 0.6s for SK
 const TInt KLongTapTimeLongDelay( 1500000 ); // 1.5s
+const TInt KDragThreshold = 20; // pixels
 // LOCAL FUNCTION PROTOTYPES
 static TRgb ConvertHslToRgb( TInt aHue, TInt aSaturation, TInt aLightness );
 static void ConvertRgbToHsl( TRgb aRGB, TUint& aHue, TUint& aSaturation,
 TUint& aLightness );
 CleanupStack::Pop( aTrgBitmap );
 }
 // -----------------------------------------------------------------------------
 // SoftkeyNode
-// Gets the node of softkey according to index
-// -----------------------------------------------------------------------------
-//
-static CXnNode* SoftkeyNodeL( CXnNode* aMenuBarNode, const TDesC8& aSoftkey )
-{
-if ( aMenuBarNode )
-{
-XnMenuInterface::MXnMenuInterface* menuIf( NULL );
-XnComponentInterface::MakeInterfaceL( menuIf, aMenuBarNode->AppIfL() );
-CXnNodePluginIf* skNode( NULL );
-if ( menuIf )
-{
-if ( aSoftkey == XnPropertyNames::softkey::type::KLeft )
-{
-skNode = menuIf->SoftKeyL(
-XnMenuInterface::MXnMenuInterface::ELeft );
-}
-else if ( aSoftkey == XnPropertyNames::softkey::type::KMiddle )
-{
-skNode = menuIf->SoftKeyL(
-XnMenuInterface::MXnMenuInterface::ECenter );
-}
-else if ( aSoftkey == XnPropertyNames::softkey::type::KRight )
-{
-skNode = menuIf->SoftKeyL(
-XnMenuInterface::MXnMenuInterface::ERight );
-}
-}
-if ( skNode )
-{
-return &skNode->Node();
-}
-}
-return NULL;
-}
-// -----------------------------------------------------------------------------
-// SoftkeyNode
 // Gets the node of softkey according to pointer location
 // -----------------------------------------------------------------------------
 //
 static CXnNode* SoftkeyNode( CXnNode* aMenuBarNode, const TPoint aPosition )
 {
 if ( iAnimation )
 {
 iAnimation->Stop();
 delete iAnimation;
 }
-if ( iGestureHelper )
+delete iGestureFw;
-{
-delete iGestureHelper;
-}
 }
 // -----------------------------------------------------------------------------
 // CXnControlAdapterImpl::CXnControlAdapterImpl
 // C++ default constructor. Must not leave.
 CXnNode* temp( node );
 for ( ; temp; temp = temp->Parent() )
 {
 if ( temp == menuBar )
 {
 // This is softkey node
-const TDesC8* pos( NULL );
+XnMenuInterface::MXnMenuInterface* menuIf( NULL );
-node = NULL;
+XnComponentInterface::MakeInterfaceL( menuIf, menuBar->AppIfL() );
-if ( aKeyEvent.iScanCode == EStdKeyDevice0 )
+if ( menuIf )
 {
-pos = &XnPropertyNames::softkey::type::KLeft;
+CXnNodePluginIf* eventNode( menuIf->KeyEventNode() );
+if ( eventNode )
+{
+node = &eventNode->Node();
+}
 }
-else if ( aKeyEvent.iScanCode == EStdKeyDevice1 )
-{
-pos = &XnPropertyNames::softkey::type::KRight;
-}
-else if ( aKeyEvent.iScanCode == EStdKeyDevice3 )
-{
-pos = &XnPropertyNames::softkey::type::KMiddle;
-}
-if ( pos )
-{
-node = SoftkeyNodeL( menuBar, *pos );
-}
 break;
 }
 }
 if ( !node )
 if ( aKeyEvent.iScanCode == EStdKeyDevice0 || // RSK
 aKeyEvent.iScanCode == EStdKeyDevice1 || // LSK
 aKeyEvent.iScanCode == EStdKeyDevice3 )  // MSK
 {
 if ( aType == EEventKeyDown )
 {
-iKeyDownNode = node;
 iLongtap = EFalse;
 if ( aKeyEvent.iScanCode == EStdKeyDevice3 ||
 aKeyEvent.iScanCode == EStdKeyEnter )
 {
 CleanupStack::PopAndDestroy( keydown );
 }
 else if( aType == EEventKey )
 {
-if( iKeyDownNode != node)
-	{
-node = iKeyDownNode;
-	}
 if ( aKeyEvent.iRepeats == 0 )
 {
 if ( !HasHoldTrigger( node->DomNode() ) )
 {
 // If node doesn't define hold trigger, then report activate
 else if ( aType == EEventKeyUp )
 {
 if ( !iLongtap )
 {
-if( iKeyDownNode != node)
-{
-node = iKeyDownNode;
-}
 if ( HasHoldTrigger( node->DomNode() ) )
 {
 // Hold trigger defined, report activate event here
 node->SetStateL(
 XnPropertyNames::style::common::KActive );
 }
 }
 }
 // -----------------------------------------------------------------------------
+// CXnControlAdapterImpl::IsDragThresholdExceeded
+// Checks if drag threshold is exceeded
+// -----------------------------------------------------------------------------
+//
+TBool CXnControlAdapterImpl::IsDragThresholdExceeded( const TPoint& aPoint )
+{
+TBool ret = EFalse;
+TPoint distance = aPoint - iButtonDownStartPoint;
+if ( Abs( distance.iX ) >= KDragThreshold ||
+Abs( distance.iY ) >= KDragThreshold )
+{
+ret = ETrue;
+}
+return ret;
+}
+// -----------------------------------------------------------------------------
 // CXnControlAdapterImpl::HandlePointerEventL
 // Handle pointer events
 // -----------------------------------------------------------------------------
 //
 TBool CXnControlAdapterImpl::HandlePointerEventL(
 {
 const TPointerEvent& event( aPointerEvent );
 CXnNode* node( &iNode.Node() );
 CXnUiEngine* engine( node->UiEngine() );
-if(!engine->IsPartialInputActive())
+if ( !engine->IsPartialInputActive() )
 {
-// Forward event to gesture helper
+InitializeGestureL( aPointerEvent );
-if( PassEventToGestureHelperL( aPointerEvent ) )
+}
-{
+else
-CXnAppUiAdapter& appui( engine->AppUiAdapter() );
+{
-CXnViewData& data( appui.ViewManager().ActiveViewData() );
+// reset destination
+iGestureDestination = NULL;
-CXnViewControlAdapter* control =
-static_cast< CXnViewControlAdapter* >( data.ViewNode()->Control() );
-control->ResetGrabbing();
-// Swipe took place, consume this event
-return ETrue;
-}
 }
 TBool menuBar( node == engine->MenuBarNode() );
 if ( menuBar )
 CancelFocusRefusalL( *engine );
 }
 if ( !menuBar && !engine->FocusedNode() )
 {
+// save starting point
+iButtonDownStartPoint = event.iPosition;
 // Require focus to be shown
 engine->AppUiAdapter().ShowFocus();
 #ifdef RD_TACTILE_FEEDBACK
 MTouchFeedback* feedback( MTouchFeedback::Instance() );
 }
 #endif
 node->SetStateL(
 XnPropertyNames::style::common::KFocus,
 XnEventSource::EStylus );
-node->SetStateL(
-XnPropertyNames::style::common::KPressedDown );
 }
 }
 else if ( event.iType == TPointerEvent::EDrag )
 {
 if ( node->IsStateSet( XnPropertyNames::style::common::KFocus ) )
 {
-if ( !node->MarginRect().Contains( event.iPosition ) )
+if ( IsDragThresholdExceeded( event.iPosition ) ||
-{
+!node->MarginRect().Contains( event.iPosition ) )
-// Remove pressed down
+{
+// Remove focus
 node->UnsetStateL(
-XnPropertyNames::style::common::KPressedDown );
+XnPropertyNames::style::common::KFocus );
-}
-if ( node->MarginRect().Contains( event.iPosition ) )
-{
-// Add pressed down
-node->SetStateL(
-XnPropertyNames::style::common::KPressedDown );
 }
 }
 }
 else if ( event.iType == TPointerEvent::EButton1Up )
 {
 if ( menuBar )
 {
 node->SetStateL( XnPropertyNames::style::common::KActive );
 }
 else if ( ( node->MarginRect().Contains( event.iPosition ) &&
-node->IsStateSet( XnPropertyNames::style::common::KFocus ) &&
+node->IsStateSet( XnPropertyNames::style::common::KFocus ) ) )
-node->IsStateSet( XnPropertyNames::style::common::KPressedDown ) ) )
 {
 #ifdef RD_TACTILE_FEEDBACK
 MTouchFeedback* feedback( MTouchFeedback::Instance() );
 if ( feedback )
 iAdapter = &aAdapter;
 if ( CreateGestureHelperL( aNode.Node() ) )
 {
-iGestureHelper = CXnGestureHelper::NewL( aNode.Node() );
+iGestureFw = CAknTouchGestureFw::NewL( *this, aAdapter );
+iGestureFw->SetGestureInterestL( EAknTouchGestureFwGroupFlick );
 }
 }
 // -----------------------------------------------------------------------------
 // CXnControlAdapterImpl::LoadBitmap
 CleanupStack::Pop( newBitmap );
 return newBitmap;
 }
 // -----------------------------------------------------------------------------
-// PassEventToGestureHelperL
+// InitializeGestureL
-// Forwards event to gesturehelper
+// Sets up gesture
 // -----------------------------------------------------------------------------
 //
-TBool CXnControlAdapterImpl::PassEventToGestureHelperL(
+void CXnControlAdapterImpl::InitializeGestureL(
 const TPointerEvent& aPointerEvent )
 {
-TBool ret( EFalse );
+if ( !iGestureFw || aPointerEvent.iType != TPointerEvent::EButton1Down )
+{
+return;
+}
-CXnNode* node( &iNode.Node() );
+CXnUiEngine* engine( iNode.Node().UiEngine() );
-CXnUiEngine* engine( node->UiEngine() );
+// Set default destination
+iGestureDestination = &iNode.Node();
-if ( iGestureHelper && iGestureHelper->Owner() == node )
-{
+RPointerArray< CXnPluginData >& plugins(
-if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
+engine->ViewManager()->ActiveViewData().PluginData() );
-{
-// Set default destination
+for ( TInt i = 0; i < plugins.Count(); i++ )
-iGestureHelper->SetDestination( iGestureHelper->Owner() );
+{
+CXnPluginData* plugin( plugins[i] );
+if ( plugin->Occupied() )
+{
+CXnNode* widget( plugin->Node()->LayoutNode() );
-RPointerArray< CXnPluginData >& plugins(
+if ( widget->MarginRect().Contains( aPointerEvent.iPosition ) )
-engine->ViewManager()->ActiveViewData().PluginData() );
+{
+// Resolve swipe destination
-for ( TInt i = 0; i < plugins.Count(); i++ )
+CXnProperty* prop( widget->GetPropertyL(
-{
+XnPropertyNames::common::KSwipeDestination ) );
-CXnPluginData* plugin( plugins[i] );
+if ( prop )
-if ( plugin->Occupied() )
 {
-CXnNode* widget( plugin->Node()->LayoutNode() );
+const TDesC8& value( prop->StringValue() );
-if ( widget->MarginRect().Contains( aPointerEvent.iPosition ) )
+if( value == XnPropertyNames::KWidget )
 {
-// Resolve swipe destination
+// Set widget as destination
-CXnProperty* prop( widget->GetPropertyL(
+iGestureDestination = widget;
-XnPropertyNames::common::KSwipeDestination ) );
+}
+else if( value == XnPropertyNames::KNone )
-if ( prop )
+{
-{
+// Set no destination
-const TDesC8& value( prop->StringValue() );
+iGestureDestination = NULL;
-if( value == XnPropertyNames::KWidget )
-{
-// Set widget as destination
-iGestureHelper->SetDestination( widget );
-}
-else if( value == XnPropertyNames::KNone )
-{
-// Set no destination
-iGestureHelper->SetDestination( NULL );
-}
-}
-break;
 }
 }
+break;
 }
 }
+}
-TXnGestureCode result( iGestureHelper->HandlePointerEventL( aPointerEvent ) );
+}
+// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+//
+void CXnControlAdapterImpl::RemoveChildAdapters()
+{
+iChildren.Reset();
+}
+// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+//
+RPointerArray< CXnControlAdapter >& CXnControlAdapterImpl::ChildAdapters()
+{
+return iChildren;
+}
+// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+//
+RFs& CXnControlAdapterImpl::FsSession()
+{
+return iAdapter->ControlEnv()->FsSession();
+}
+// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+//
+void CXnControlAdapterImpl::HandleTouchGestureL( MAknTouchGestureFwEvent& aEvent )
+{
+if ( aEvent.Group() == EAknTouchGestureFwGroupFlick )
+{
+TAknTouchGestureFwType type = aEvent.Type();
 const TDesC8* swipe( NULL );
-if ( result == EGestureSwipeLeft )
+if ( type == EAknTouchGestureFwFlickLeft )
 {
 swipe = &XnPropertyNames::action::trigger::name::swipe::direction::KLeft;
 }
-else if ( result == EGestureSwipeRight )
+else if ( type == EAknTouchGestureFwFlickRight )
 {
 swipe = &XnPropertyNames::action::trigger::name::swipe::direction::KRight;
 }
-if ( swipe )
+if ( swipe && iGestureDestination )
 {
-CXnNode* destination( iGestureHelper->Destination() );
+CXnUiEngine* engine = iNode.Node().UiEngine();
+if ( iGestureDestination == &iNode.Node() )
+{
+CancelFocusRefusalL( *engine );
+}
-if ( destination )
+// Remove focus
-{
+engine->AppUiAdapter().HideFocus();
-if ( destination == iGestureHelper->Owner() )
-{
+CXnNode* trigger( BuildSwipeTriggerNodeLC( *engine, *swipe ) );
-CancelFocusRefusalL( *engine );
+iGestureDestination->ReportXuikonEventL( *trigger );
-}
+CleanupStack::PopAndDestroy( trigger );
-// Remove focus
+CXnAppUiAdapter& appui( engine->AppUiAdapter() );
-engine->AppUiAdapter().HideFocus();
+CXnViewData& data( appui.ViewManager().ActiveViewData() );
-CXnNode* trigger( BuildSwipeTriggerNodeLC( *engine, *swipe ) );
+CXnViewControlAdapter* control =
-destination->ReportXuikonEventL( *trigger );
+static_cast< CXnViewControlAdapter* >( data.ViewNode()->Control() );
-CleanupStack::PopAndDestroy( trigger );
+control->ResetGrabbing();
-// If needed we can call here for example HandleSwipeL()
+}
+}
-// Consume this event
-ret = ETrue;
-}
-}
-}
-return ret;
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CXnControlAdapterImpl::RemoveChildAdapters()
-{
-iChildren.Reset();
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-RPointerArray< CXnControlAdapter >& CXnControlAdapterImpl::ChildAdapters()
-{
-return iChildren;
-}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-RFs& CXnControlAdapterImpl::FsSession()
-{
-return iAdapter->ControlEnv()->FsSession();
 }
 // ============================= TIconProvider ===============================

branch	RCL_3
changeset 34	d05a55b217df
parent 30	b8fae6b8a148
child 47	7be2816dbabd