diff -r b8fae6b8a148 -r d05a55b217df taskswitcher/taskswitcherui/taskswitcherapp/src/tsappview.cpp --- a/taskswitcher/taskswitcherui/taskswitcherapp/src/tsappview.cpp Wed Mar 31 21:17:19 2010 +0300 +++ b/taskswitcher/taskswitcherui/taskswitcherapp/src/tsappview.cpp Wed Apr 14 15:47:59 2010 +0300 @@ -457,6 +457,10 @@ TSLOG_CONTEXT( CTsAppView::HandleSwitchToForegroundEvent, TSLOG_LOCAL ); TSLOG_IN(); + // Forward event to interested controls + iFastSwapArea->HandleSwitchToForegroundEvent(); + iFastSwapArea->UpdateComponentVisibility(); + // Check for layout updates CTsAppUi* appUi = static_cast(iCoeEnv->AppUi()); if ( iViewRect != appUi->ApplicationRect() && @@ -477,10 +481,6 @@ // Focus jumps back to fsw ChangeFocus( iFastSwapArea ); - // Forward event to interested controls - iFastSwapArea->HandleSwitchToForegroundEvent(); - iFastSwapArea->UpdateComponentVisibility(); - // Start animation CTsAppUi* appui = static_cast( iEikonEnv->AppUi() ); @@ -614,9 +614,8 @@ { LaunchFeedback(ETouchFeedbackBasic, TTouchFeedbackType( ETouchFeedbackVibra | ETouchFeedbackAudio), aPointerEvent); - if ( !( iFastSwapArea->Rect().Contains(aPointerEvent.iParentPosition) || - iAppsHeading->Rect().Contains(aPointerEvent.iParentPosition) - ) ) + + if( !DragArea().Contains(aPointerEvent.iParentPosition)) { //move task switcher to background iEvtHandler->EnableEventHandling(EFalse); @@ -730,13 +729,7 @@ // void CTsAppView::DragL(const MAknTouchGestureFwDragEvent& aEvent) { - if( aEvent.State() == EAknTouchGestureFwStop ) - { - LaunchFeedback(ETouchFeedbackBasic, TTouchFeedbackType( - ETouchFeedbackVibra | ETouchFeedbackAudio), TPointerEvent()); - } - if( iFastSwapArea->Rect().Contains(aEvent.StartPosition()) || - iAppsHeading->Rect().Contains(aEvent.StartPosition()) ) + if(DragArea().Contains(aEvent.StartPosition())) { iFastSwapArea->DragL(aEvent); } @@ -778,6 +771,34 @@ } +// ----------------------------------------------------------------------------- +// CTsAppView::AppCloseInProgress() +// ----------------------------------------------------------------------------- +// +TBool CTsAppView::AppCloseInProgress( TInt aWgId ) + { + return iFastSwapArea->IsAppClosing(aWgId); + } +// ----------------------------------------------------------------------------- +// CTsAppView::DragArea +// ----------------------------------------------------------------------------- +// +TRect CTsAppView::DragArea() + { + TRect dragArea; + if (Layout_Meta_Data::IsLandscapeOrientation()) + { + dragArea.SetRect(iAppsHeading->Rect().iTl.iX, + iAppsHeading->Rect().iTl.iY, iFastSwapArea->Rect().iBr.iX, + iFastSwapArea->Rect().iBr.iY); + } + else + { + dragArea.SetRect(Rect().iTl.iX, iAppsHeading->Rect().iTl.iY, + Rect().iBr.iX, iFastSwapArea->Rect().iBr.iY); + } + return dragArea; + } // End of file