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

equal deleted inserted replaced

-:2a26698d78ba
+:38529f706030
 TResourceReader reader;
 iCoeEnv->CreateResourceReaderLC( reader, R_INPUTFIELD );
 ConstructEditorFromResourceL( reader );
 iFrameContext = CAknsFrameBackgroundControlContext::NewL(
 KAknsIIDNone, TRect(0,0,4,4), TRect(1,1,3,3), EFalse );
 iFrameContext->SetFrame( KAknsIIDQsnFrCall2Rect );
 iFrameContext->SetParentContext(
 AknsDrawUtils::ControlContextOfParent(this) );
 CleanupStack::PopAndDestroy();    // reader
 iEditor->SetObserver( this );
 iLabel = new( ELeave ) CEikLabel;
 iLabel->SetContainerWindowL( *this );
 iLabel->SetParent( this );
 iLabel->SetMopParent( this );
 iLabel->SetTextL( KNullDesC );
 iLabel->MakeVisible( EFalse );
 CheckLabelSkinningColor();
 iAppUi = iEikonEnv->EikAppUi();
 __ASSERT_ALWAYS( iAppUi, DialerPanic( EDialerPanicNoApplicationInstance ) );
 //
 void CDialerNumberEntry::SetTextToNumberEntry( const TDesC& aDesC )
 {
 DIALER_PRINT("numberentry::SetTextToNumberEntry<");
 iEditor->SetText( aDesC );
 if ( iEasyDialer && iOperationMode == EModeEasyDialing )
 {
 TRAP_IGNORE( iEasyDialer->SetInputL( aDesC ) );
 }
 if ( aControl == iEditor && aEventType == EEventStateChanged )
 {
 HandleEditorFormatting();
 InformNumberEntryState();
 iEditor->DrawDeferred();
 }
 DIALER_PRINT("numberentry::HandleControlEventL>");
 }
 // ---------------------------------------------------------------------------
 // CDialerNumberEntry::OfferKeyEventL
 // ---------------------------------------------------------------------------
 TInt maxChars = aReader.ReadInt16();
 TInt maxLines = aReader.ReadInt16();
 HBufC* truncation = aReader.ReadHBufCL();
 CleanupStack::PushL( truncation );
 TInt formatCount = aReader.ReadInt16();
 iEditor->ConstructL( maxChars, maxLines, formatCount, *truncation );
 CleanupStack::PopAndDestroy( truncation );
 iFormatCount = formatCount;
 for ( TInt ii = 0; ii < iFormatCount; ii++ )
 {
 CAknPhoneNumberEditor::TFormat format( aReader );
-	    CalculateLayout( format, ii );
+CalculateLayout( format, ii );
 iEditor->AddFormat( format );
 }
 iEditor->SetFormat( KDialerNELayoutLargeFont );
 }
 TInt currentFormat = iEditor->CurrentFormatIndex();
 for ( TInt ii = 0; ii < iFormatCount; ii++ )
 {
 CAknPhoneNumberEditor::TFormat format( iEditor->Format( ii ) );
-		CalculateLayout( format, ii );
+CalculateLayout( format, ii );
 iEditor->Format( ii ) = format;
 }
 iEditor->SetFormat( currentFormat );
 DIALER_PRINT("numberentry::UpdateNumberEntryFormats>");
 // focus. This is to prevent accidental cursor movements as putting the
 // cursor back to the end of the text is difficult for right-aligned
 // text.
 if ( iEditor->IsFocused() )
 {
-CCoeControl::HandlePointerEventL( aPointerEvent );
+// If user hits the margin area between this control and the actual editor
+// control, then the event position is moved to be inside the editor region.
+// This makes it easier to move cursor with finger touch, especially in
+// both ends of the number field.
+TPoint eventPos( aPointerEvent.iPosition );
+TRect editorRect( iEditor->Rect() );
+editorRect.Shrink( 1, 1 ); // take rect which is fully inside the editor rect
+eventPos.iX = Min( eventPos.iX, editorRect.iBr.iX );
+eventPos.iX = Max( eventPos.iX, editorRect.iTl.iX );
+eventPos.iY = Min( eventPos.iY, editorRect.iBr.iY );
+eventPos.iY = Max( eventPos.iY, editorRect.iTl.iY );
+TPointerEvent modEvent( aPointerEvent );
+modEvent.iPosition = eventPos;
+CCoeControl::HandlePointerEventL( modEvent );
 }
 }
 // ---------------------------------------------------------------------------
 // CDialerNumberEntry::HandleEditorFormatting
 }
 if ( iEditor->CurrentFormatIndex() != format )
 {
 iEditor->DrawDeferred();
 iEditor->SetFormat( format );
 iFrameContext->SetRect( Rect() );
 }
 }
 // ---------------------------------------------------------------------------
 {
 aOuterRect = Rect();
 TAknLayoutRect innerRectLayout;
 innerRectLayout.LayoutRect( aOuterRect, AknLayoutScalable_Apps::bg_dia3_numentry_pane_g1() );
 aInnerRect = innerRectLayout.Rect();
+// Add a bit of margin to left and right ends of the entry field if layout
+// doens't define enough. This is to enhance the touch usability.
+static const TInt KMinMargin( 10 );
+aInnerRect.iTl.iX = Max( aInnerRect.iTl.iX, aOuterRect.iTl.iX + KMinMargin );
+aInnerRect.iBr.iX = Min( aInnerRect.iBr.iX, aOuterRect.iBr.iX - KMinMargin );
 }
 else
 {
 if ( Layout_Meta_Data::IsMirrored() )
 {
 TAknLayoutRect frameTopRight;
 frameTopRight.LayoutRect(
 aFrameRect,
 AknLayoutScalable_Apps::bg_popup_call2_rect_pane_g3().LayoutLine() );
 TAknLayoutRect frameBottomLeft;
 frameBottomLeft.LayoutRect(
 aFrameRect,
 AknLayoutScalable_Apps::bg_popup_call2_rect_pane_g4().LayoutLine() );
 aOuterRect = TRect( frameTopRight.Rect().iTl,
 frameBottomLeft.Rect().iBr );
 aInnerRect = TRect( frameTopRight.Rect().iBr,
 frameBottomLeft.Rect().iTl );
 }
 else
 {
 TAknLayoutRect frameTopLeft;
 frameTopLeft.LayoutRect(
 aFrameRect,
 AknLayoutScalable_Apps::bg_popup_call2_rect_pane_g2().LayoutLine() );
 TAknLayoutRect frameBottomRight;
 frameBottomRight.LayoutRect(
 aFrameRect,
 AknLayoutScalable_Apps::bg_popup_call2_rect_pane_g5().LayoutLine() );
 aOuterRect = TRect( frameTopLeft.Rect().iTl,
 frameBottomRight.Rect().iBr );
 aInnerRect = TRect( frameTopLeft.Rect().iBr,
 frameBottomRight.Rect().iTl );
 }
 }
 }
 // -----------------------------------------------------------------------------
 {
 // Ignore error
 TRAP_IGNORE( iLabel->OverrideColorL( EColorLabelText, skinColor ) );
 }
 }
 // -----------------------------------------------------------------------------
 // CDialerNumberEntry::MakeVisible( TBool aVisible )
 // -----------------------------------------------------------------------------
 //
 void CDialerNumberEntry::MakeVisible( TBool aVisible )
 	{
 	CCoeControl::MakeVisible( aVisible );
 	iEditor->MakeVisible( aVisible );
 	}
 // -----------------------------------------------------------------------------
 // CDialerNumberEntry::SetEasyDialingPlugin
 // -----------------------------------------------------------------------------
 //
 void CDialerNumberEntry::SetEasyDialingPlugin(CDialingExtensionInterface* aEasyDialer)

branch	RCL_3
changeset 6	38529f706030
parent 4	24062c24fe38
child 7	544e34b3255a