FCL/sf/app/utils: comparison extras/calcsoft/src/CalcFunc.cpp

equal deleted inserted replaced

-:99b535de1dda
+:a7d8840c0b8c
 iIsKeyLongPress = ETrue;
 }
 //Get the selected button
 CAknButton* button = (CAknButton*)aControl;
 for ( TInt i = 0; i < KCountOfButtons; ++i )
 {
 if ( button == iButtons[i] )
 {
 if(iSelected != i)
 return;
 //break;
 }
 }
+// Check if the button has been pressed.
+CAknButtonState* state = button->State(EnNormal);
+if ( aEventType == EEventStateChanged && state->Flags() == EnNormal )
+{
+iInputData = ETrue;
+}
 if ( !button->IsDimmed() )
 {
 //handles all the commands for the buttons
 if( !AknLayoutUtils::PenEnabled() )
 }
 }
 }
 else
 {
-if ( iIsKeyLongPress )
+// Input data if the button has been pressed or long pressed.
+if ( iInputData || iIsKeyLongPress )
 {
 iContainer->View()->HandleCommandL(KButtonsIdTblTouch[iSelected]);
+iInputData = EFalse;
 }
 }
 }
 if( iErrorCode != KErrNone )
 iLastKeyCode = aKeyEvent.iCode;
 }
 else if (aType == EEventKeyDown)
 {
 iIsOfferKeyEvent = ETrue;
+// If the enter key has been pressed, set the button and input data.
+if ( aKeyEvent.iCode == EKeyEnter || aKeyEvent.iScanCode == EStdKeyEnter )
+{
+exitCode = EKeyWasConsumed;
+HandleMiddleSoftKeyOREKeyOKL();
+iShiftKeyPressed = EPtiCaseLower;
+return exitCode;
+}
 }
 else if (aType == EEventKeyUp)
 {
 iIsOfferKeyEvent = EFalse;
+// Release the button when enter key released.
+if ( aKeyEvent.iCode == EKeyEnter || aKeyEvent.iScanCode == EStdKeyEnter )
+{
+NotifyReleaseKeyL();
+}
 }
 return exitCode;
 }
 NULL,
 NULL,
 NULL,
 _L(""),
 _L(""),
-0,
+// Report the observer when the button recieve the key down event.
+KAknButtonReportOnKeyDown,
 0
 );
 }
 else
 NULL,
 iCalcAppEnv->PressedButtonBmp(count),
 NULL,
 _L(""),
 _L(""),
-0,
+// Report the observer when the button recieve the key down event.
+KAknButtonReportOnKeyDown,
 0
 );
 /*if((count == ESqrtButton) && !iIsChangeSignDimmed)
 {
 iButtons[count]->SetDimmed(ETrue);
 state->SetFlags(EnNormal);
 }
 if( aOldId != aNewId )
 {
+button->SetFocus( EFalse, EDrawNow );
 button = iButtons[aNewId];
 }
 }
 // ---------------------------------------------------------
 if( aOldId != aNewId )
 {
 button->SetFocus( EFalse, EDrawNow );
 button = iButtons[aNewId];
 button->SetFocus( ETrue, EDrawNow );
 }
 }
 // ---------------------------------------------------------
 // CCalcFuncmapSubPane::SetLayout
 // Set functionmap button layout.
 // (other items were commented in a header).
 iSelected = buttonValue;
 if ( iButtons[buttonValue]->Rect().Contains( aPointerEvent.iPosition ) )
 {
 RedrawHighlight( oldSelect, iSelected );
 }
-if( aPointerEvent.iType == TPointerEvent::EButton1Down )
+else
 {
-iContainer->View()->HandleCommandL(KButtonsIdTblTouch[iSelected]);
+//when user drag outside of button,the Button Up event is missed always.
-iInputData = ETrue;
+//Because the pointer is out of the button and it can't get the pointer
-}
+//event any more. We simulate the button up event to release the button
+//when user drag out of button
+if( aPointerEvent.iType == TPointerEvent::EDrag )
+{
+TPointerEvent event = aPointerEvent;
+event.iType = TPointerEvent::EButton1Up;
+iInputData = EFalse;
+if( iErrorCode != KErrNone )
+{
+ErrorMsgL( iErrorCode );
+iErrorCode = KErrNone;
+}
+CCoeControl::HandlePointerEventL( event );
+return;
+}
+}
 if( aPointerEvent.iType == TPointerEvent::EButton1Up )
 {
 iInputData = EFalse;
 if( iErrorCode != KErrNone )
 {
 // ---------------------------------------------------------
 //
 void CCalcFuncmapSubPane::HandleMiddleSoftKeyOREKeyOKL()
 {
 //get the selected button id
 CAknButton* button = iButtons[iSelected];
 //put the button in the pressed state
 CAknButtonState* state = button->State(EnNormal);
 //Put the button in pressed state
 TKeyEvent aKeyEvent;
 aKeyEvent.iScanCode = EStdKeyEnter;
 TEventCode aType = EEventKeyDown;
 button->OfferKeyEventL(aKeyEvent,aType);
-//put to pressed state
-state->SetFlags(EnPressed);
+//put to pressed state
-button->DrawNow();
+state->SetFlags(EnPressed);
+button->DrawNow();
-if(!iIsOfferKeyEvent)
-{
-NotifyReleaseKeyL();
-}
 }
 // ---------------------------------------------------------
 // CCalcFuncmapSubPane::GetChangeSignButtonState
 // Returns the state of change sign button

branch	RCL_3
changeset 21	a7d8840c0b8c
parent 19	99b535de1dda