MCL/sf/app/phone: comparison phoneuis/dialer/src/cdialerkeypadcontainer.cpp

equal deleted inserted replaced

-:2a26698d78ba
+:38529f706030
 #include <aknlayoutscalable_apps.cdl.h>
 #include <layoutmetadata.cdl.h>
 #include <data_caging_path_literals.hrh> // for KDC_APP_RESOURCE_DIR
 #include <touchfeedback.h>
 #include <aknlayoutscalable_avkon.cdl.h>
-#include <aknsframebackgroundcontrolcontext.h>
+#include <AknsFrameBackgroundControlContext.h>
 #include "cdialerkeypadcontainer.h"
 #include "dialercommon.h"
 #include "dialertrace.h"
 CCoeControl::HandlePointerEventL( aPointerEvent );
 if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
 {
 iPointerEvent = aPointerEvent;
+iKeyUpSimulatedDueToDragging = EFalse;
 }
 DIALER_PRINT("KeyPadContainer::HandlePointerEventL>");
 }
 // ---------------------------------------------------------------------------
 //
 void CDialerKeyPadContainer::CreateButtonsL()
 {
 DIALER_PRINT("KeyPadContainer::CreateButtonsL<");
-TInt flags ( KAknButtonReportOnLongPress|
+TInt flags ( KAknButtonReportOnKeyDown  |
-KAknButtonReportOnKeyDown  |
 KAknButtonRequestExitOnButtonUpEvent );
 for ( TInt i = 0; i < KNumberOfButtons; i++ )
 {
 const TPtrC numLabel = iKeyLabelManager->ButtonNumLabel( i );
 TCoeEvent aEventType )
 {
 DIALER_PRINTF("KeyPadContainer::HandleControlEventL.EventType=",
 (TInt)aEventType);
 if ( aEventType == EEventStateChanged   ||
 aEventType == EEventRequestCancel ||
-aEventType == EEventRequestExit)
+aEventType == EEventRequestExit ||
+aEventType == CDialerKeyPadButton::EEventDraggingOutsideButton )
 {
 // Find tapped control
 CDialerKeyPadButton* tappedButton = NULL;
 tappedButton = iButtons[i];
 break;
 }
 }
-__ASSERT_ALWAYS( tappedButton,
+if ( !tappedButton )
-_L("CDialerKeyPadContainer::HandleControlEventL, invalid button handle")); // TODO: This is meaningless statement, use either Panic or make this only comment.
+{
+__ASSERT_DEBUG( EFalse, DialerPanic( EDialerPanicEventFromUnknownControl ) );
+return;
+}
 // Send key event to phone.
 TKeyEvent keyEvent;
 keyEvent.iScanCode = tappedButton->ScanCode();
 keyEvent.iModifiers = ( EModifierNumLock | EModifierKeypad ); // Mark that this event is dialer simulated
 keyEvent.iRepeats = 0;
 switch ( aEventType )
 {
 case EEventRequestExit:
 case EEventRequestCancel:
 {
 DIALER_PRINT("HandleControlEventL.EEventRequestExit");
 iButtonPressedDown = EFalse;
-keyEvent.iCode = 0;
+if ( !iKeyUpSimulatedDueToDragging )
-ControlEnv()->SimulateKeyEventL( keyEvent, EEventKeyUp );
+{
+keyEvent.iCode = 0;
+ControlEnv()->SimulateKeyEventL( keyEvent, EEventKeyUp );
+}
+iKeyUpSimulatedDueToDragging = EFalse;
 }
 break;
 case EEventStateChanged:
 {
 DIALER_PRINT("HandleControlEventL.EEventStateChanged");
 iButtonPressedDown = ETrue;
 keyEvent.iCode = tappedButton->KeyCode();
 iParentControl.PrepareForFocusGainL();
 ControlEnv()->SimulateKeyEventL( keyEvent, EEventKeyDown );
 if( iButtonPressedDown )
 {
 // Send event key if key havent be lifted up already
 ControlEnv()->SimulateKeyEventL( keyEvent, EEventKey );
 }
 }
 break;
+case CDialerKeyPadButton::EEventDraggingOutsideButton:
+{
+DIALER_PRINT("HandleControlEventL.EEventDraggingOutsideButton");
+// User hasn't released touch yet but in order to cancel
+// long press action handled and initiated by parent control,
+// we must send key up event now.
+if ( !iKeyUpSimulatedDueToDragging )
+{
+keyEvent.iCode = 0;
+ControlEnv()->SimulateKeyEventL( keyEvent, EEventKeyUp );
+iKeyUpSimulatedDueToDragging = ETrue;
+}
+}
+break;
 default:
 break;
 }
 }
 DIALER_PRINT("KeyPadContainer::HandleControlEventL>");
 }
 // ---------------------------------------------------------------------------
 // CDialerKeyPadContainer::HandleResourceChange
 //
 // Forwards skin change event to buttons
 //
 //
 void CDialerKeyPadContainer::EnableTactileFeedback( const TBool aEnable )
 {
 for ( TInt i=0; i < iButtons.Count(); i++ )
 {
-(( CDialerKeyPadButton* )iButtons[i])->EnableAudioFeedback( aEnable );
+iButtons[i]->EnableAudioFeedback( aEnable );
 }
 }
 // End of File

branch	RCL_3
changeset 6	38529f706030
parent 5	2a26698d78ba
child 7	544e34b3255a