MCL/sf/mw/inputmethods: comparison textinput/peninputarc/src/peninputlayoutcontrol/peninputlayoutbasecontrol.cpp

equal deleted inserted replaced

-:e6a39382bb9c
+:c8fb4cf7b3ae
 iAllowOverlap(EFalse),
 iUiLayout(aUiLayout),
 iOwnWndCtrl(ETrue),
 iOrdinalPos(EOrderNomal)
 {
-#ifdef RD_TACTILE_FEEDBACK
+//todo code refactoring needed, move to BaseConstructL
-iReservered1 = reinterpret_cast<TInt>(new CFepUiBaseCtrlExtension(ETouchFeedbackNone));
+iExtension = new CFepUiBaseCtrlExtension();
-#endif // RD_TACTILE_FEEDBACK
 iPenSize.SetSize(1,1);
 iBorderSize.SetSize(KDefaultFrameWidth,KDefaultFrameWidth);
 iValidRegion.AddRect(iRect);
 iClipRegion.AddRect(iRect);
 }
 iIsActive(EFalse),
 iAllowOverlap(EFalse),
 iUiLayout(aUiLayout),
 iOwnWndCtrl(aOwnership)
 {
-#ifdef RD_TACTILE_FEEDBACK
+//todo code refactoring needed, move to BaseConstructL
-iReservered1 = reinterpret_cast<TInt>(new CFepUiBaseCtrlExtension(ETouchFeedbackNone));
+iExtension = new CFepUiBaseCtrlExtension();
-#endif // RD_TACTILE_FEEDBACK
 iRect = aControl->Rect();
 iControlId = aControl->UniqueHandle();
 iValidRegion.AddRect(iRect);
 iClipRegion.AddRect(iRect);
 }
 #ifdef RD_TACTILE_FEEDBACK
 //de-register the area for tactile feedback
 //if(aUiLayout) //there must be aUiLayout
 UiLayout()->DeRegisterFeedbackArea(reinterpret_cast<TInt>(this), Rect());
-	delete reinterpret_cast<CFepUiBaseCtrlExtension*>(iReservered1);
 #endif // RD_TACTILE_FEEDBACK
+delete iExtension;
 }
 // ---------------------------------------------------------------------------
 // CFepUiBaseCtrl::BaseConstructL
 // Handle UI event
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CFepUiBaseCtrl::SetTactileFeedbackType(TInt aTactileType)
 	{
 #ifdef RD_TACTILE_FEEDBACK
-	reinterpret_cast<CFepUiBaseCtrlExtension*>(iReservered1)->SetTactileFeedbackType(aTactileType);
+iExtension->SetTactileFeedbackType(aTactileType);
 #endif // RD_TACTILE_FEEDBACK
 	}
 // ---------------------------------------------------------------------------
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 EXPORT_C TBool CFepUiBaseCtrl::Contains(const TPoint& aPt)
 {
+if( iExtension->iExtResponseAreaActive )
+{
+return iExtension->iExtResponseArea.Contains( aPt );
+}
 return iRect.Contains(aPt);
 //return iValidRegion.Contains(aPt);
 }
 // ---------------------------------------------------------------------------
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 EXPORT_C CFepUiBaseCtrl* CFepUiBaseCtrl::HandlePointerDownEventL(const TPoint& aPoint)
 {
+if ( iExtension->iExtResponseAreaEnabled )
+{
+ActiveExtResponseArea();
+}
 iPointerDown = ETrue;
 if(iWndControl)
 {
 TPointerEvent event;
 event.iType = TPointerEvent::EButton1Down;
 // ---------------------------------------------------------------------------
 //
 EXPORT_C CFepUiBaseCtrl* CFepUiBaseCtrl::HandlePointerUpEventL(
 const TPoint& aPoint)
 {
+if ( iExtension->iExtResponseAreaActive )
+{
+CancelExtResponseArea();
+}
 iPointerDown = EFalse;
 if(iWndControl)
 {
 TPointerEvent event;
 event.iType = TPointerEvent::EButton1Up;
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CFepUiBaseCtrl::CancelPointerDownL()
 {
+if ( iExtension->iExtResponseAreaActive )
+{
+CancelExtResponseArea();
+}
 if (PointerDown())
 {
 iPointerDown = EFalse;
 iPointerLeft = EFalse;
 //HandlePointerLeave(TPoint(0, 0));
 // Handle pointer leave event
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CFepUiBaseCtrl::HandlePointerLeave(const TPoint& /*aPt*/)
 {
+if ( iExtension->iExtResponseAreaActive )
+{
+CancelExtResponseArea();
+}
 iPointerDown = EFalse;
 iPointerLeft = ETrue;
 //report event
 ReportEvent(EEventPointerLeftControl);
 Draw();
 // Handle pointer enter event
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CFepUiBaseCtrl::HandlePointerEnter(const TPoint& aPt)
 {
+if ( iExtension->iExtResponseAreaEnabled )
+{
+ActiveExtResponseArea();
+}
 iPointerDown = ETrue;
 iPointerLeft = EFalse;
 TRAP_IGNORE(HandlePointerMoveEventL(aPt));
 //report event
 ReportEvent(EEventPointerEnterControl);
 if(ParentCtrl())
 order += ParentCtrl()->AbsOrderPos();
 return order;
 }
+// ---------------------------------------------------------------------------
+// CFepUiBaseCtrl::EnableExtResponseArea
+// Enable/disable extra response area support
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CFepUiBaseCtrl::EnableExtResponseArea( TBool aEnable,
+const TRect& aExtMargin )
+{
+iExtension->iExtResponseAreaEnabled = aEnable;
+iExtension->iExtResponseAreaMargin = aExtMargin;
+}
+// ---------------------------------------------------------------------------
+// CFepUiBaseCtrl::EnableExtResponseArea
+// Active extra response area
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CFepUiBaseCtrl::ActiveExtResponseArea()
+{
+if ( iExtension->iExtResponseAreaEnabled )
+{
+TRect response = Rect();
+response.iTl -= iExtension->iExtResponseAreaMargin.iTl;
+response.iBr += iExtension->iExtResponseAreaMargin.Size();
+UpdateExtResponseArea( response );
+}
+}
+// ---------------------------------------------------------------------------
+// CFepUiBaseCtrl::EnableExtResponseArea
+// Cancel extra response area
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CFepUiBaseCtrl::CancelExtResponseArea()
+{
+iExtension->iExtResponseAreaActive = EFalse;
+CFepUiBaseCtrl* parent = ParentCtrl();
+if( parent && parent->IsKindOfControl(ECtrlControlGroup) )
+{
+parent->CancelExtResponseArea();
+}
+}
+// ---------------------------------------------------------------------------
+// CFepUiBaseCtrl::EnableExtResponseArea
+// Update extra response area
+// ---------------------------------------------------------------------------
+//
+void CFepUiBaseCtrl::UpdateExtResponseArea( const TRect& aRect )
+{
+if ( aRect.iTl.iX < Rect().iTl.iX || aRect.iTl.iY < Rect().iTl.iY ||
+aRect.iBr.iX > Rect().iBr.iX || aRect.iBr.iY > Rect().iBr.iY )
+{
+iExtension->iExtResponseAreaActive = ETrue;
+iExtension->iExtResponseArea = Rect();
+iExtension->iExtResponseArea.BoundingRect( aRect );
+//update parent
+CFepUiBaseCtrl* parent = ParentCtrl();
+if ( parent && parent->IsKindOfControl( ECtrlControlGroup ) )
+{
+parent->UpdateExtResponseArea( iExtension->iExtResponseArea );
+}
+}
+}
 // ---------------------------------------------------------------------------
 // CFepUiBaseCtrl::CFepUiBaseCtrlExtension
 //
 // ---------------------------------------------------------------------------
 //
-CFepUiBaseCtrl::CFepUiBaseCtrlExtension::CFepUiBaseCtrlExtension(TInt aTactileType)
+CFepUiBaseCtrl::CFepUiBaseCtrlExtension::CFepUiBaseCtrlExtension()
 	{
 #ifdef RD_TACTILE_FEEDBACK
-	iTactileType = aTactileType;
+	iTactileType = ETouchFeedbackNone;
 #endif // RD_TACTILE_FEEDBACK
+	//temp code, can be removed after refactoring of CFepUiBaseCtrl::iExtension
+iExtResponseAreaActive = EFalse;
+iExtResponseArea.SetRect( TPoint(0,0), TSize(0,0) );
+iExtResponseAreaEnabled = EFalse;
+iExtResponseAreaMargin.SetRect( TPoint(0,0), TSize(0,0) );
 	}
 void CFepUiBaseCtrl::CFepUiBaseCtrlExtension::SetTactileFeedbackType(TInt aTactileType)
 	{
 #ifdef RD_TACTILE_FEEDBACK

branch	RCL_3
changeset 11	c8fb4cf7b3ae
parent 9	e6a39382bb9c
child 12	5e18d8c489d6