FCL/sf/mw/classicui: comparison uifw/AvKon/src/AknCharMap.cpp

equal deleted inserted replaced

-:71dd06cfe933
+:0aa5fbdfbc30
 // ----------------------------------------------------------------------------
 // Navi button class definition
 // ----------------------------------------------------------------------------
 //
-NONSHARABLE_CLASS(CAknSctNaviButton) : public CBase
+NONSHARABLE_CLASS(CAknSctNaviButton) : public CBase, public MCoeControlObserver
 {
 public:
-static CAknSctNaviButton* NewL(
+static CAknSctNaviButton* NewL(const CCoeControl& aParent, TInt aButtonId, TResourceReader& reader);
-const CCoeControl& aParent,
-TInt aButtonId,
-TResourceReader& reader);
 ~CAknSctNaviButton();
 private:
 CAknSctNaviButton(TInt aButtonId);
-void ConstructL(
+void ConstructL(const CCoeControl& aParent, TResourceReader& reader);
-const CCoeControl& aParent,
-TResourceReader& reader);
+private: // from MCoeControlObserver
+virtual void HandleControlEventL(CCoeControl* aControl, TCoeEvent aEventType);
 public:
+void SetObserver(MCoeControlObserver* aObserver);
 void SetFocused(TBool aState);
 void SetEnabled(TBool aState);
 TBool IsFocused();
 TBool IsEnabled();
 public:
 CAknButton* iButtonControl;
+MCoeControlObserver* iObserver;
 TInt iButtonId;
 TBool iPressed;
 TBool iRepeat;
 };
 // ----------------------------------------------------------------------------
 // Table Navi class definition
 // ----------------------------------------------------------------------------
 //
-NONSHARABLE_CLASS(CAknSctTableNavi) : public CAknControl, public MAknSctFocusHandler
+NONSHARABLE_CLASS(CAknSctTableNavi) : public CAknControl, public MAknSctFocusHandler, public MCoeControlObserver
 {
 public:
 CAknSctTableNavi(CAknCharMap* aCharMap, CAknCharMapExtension* aExtension);
 ~CAknSctTableNavi();
 public:  // from CCoeControl
 TInt CountComponentControls() const;
 CCoeControl* ComponentControl( TInt aIndex ) const;
 virtual TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode);
 void ConstructFromResourceL(TResourceReader& aReader);
-virtual void HandlePointerEventL(const TPointerEvent& aPointerEvent);
 virtual TSize MinimumSize();
 virtual void SizeChanged();
+public: // from MCoeControlObserver
+void HandleControlEventL(CCoeControl* aControl, TCoeEvent aEventType);
 public: // from MAknSctFocusHandler
 virtual CCoeControl* FocusedControl();
 virtual TBool EnterControl(TInt aX, TInt aY);
 virtual void MoveFocus(TInt aX, TInt aY);
 virtual TBool ExitWithKey(TInt aKeycode);
 virtual TBool LeaveControl();
 public:
 TInt TableCount();
+void UpdateNextTableButtonL();
+private:
 void TableExitL();
-static TInt DoTableExit(TAny* aThis);
+static TInt TableExitCallBackL(TAny* aThis);
-void UpdateNextTableButtonL();
+void DoTableExitL();
+void NextTableL();
+static TInt NextTableCallBackL(TAny* aThis);
+void DoNextTableL();
 private:
 TInt ButtonPosition(TInt aButtonIndex) const;
-TInt SetStatusChanged();
-void NextTableL();
 private:  // data
 TInt iButtonIndex;
 RPointerArray<CAknSctNaviButton> iButtonArray;
 CAknCharMap* iCharMap;
 void CAknSctNaviButton::ConstructL(const CCoeControl& aParent, TResourceReader& aReader)
 {
 iButtonControl = CAknButton::NewL(aReader);
 iButtonControl->SetContainerWindowL(aParent);
+iButtonControl->SetObserver(this);
+}
+void CAknSctNaviButton::SetObserver(MCoeControlObserver* aObserver)
+{
+iObserver = aObserver;
+}
+void CAknSctNaviButton::HandleControlEventL(CCoeControl* aControl, TCoeEvent aEventType)
+{
+if(iObserver) iObserver->HandleControlEventL(aControl, aEventType);
 }
 CAknSctNaviButton::~CAknSctNaviButton()
 {
 delete iButtonControl;
 return response;
 }
 void CAknSctTableNavi::TableExitL()
 {
-delete iIdle;
+if(!iIdle)
-iIdle = 0;
+{
 iIdle = CIdle::NewL(CActive::EPriorityStandard);
-iIdle->Start(TCallBack(DoTableExit, this));
+}
-}
+iIdle->Cancel();
-TInt CAknSctTableNavi::DoTableExit(TAny* aThis)
+iIdle->Start(TCallBack(TableExitCallBackL, this));
-{
+}
-return ((CAknSctTableNavi*)aThis)->SetStatusChanged();
+TInt CAknSctTableNavi::TableExitCallBackL(TAny* aThis)
+{
+((CAknSctTableNavi*)aThis)->DoTableExitL();
+return KErrNone;
+}
+void CAknSctTableNavi::DoTableExitL()
+{
+iCharMap->SetStatusChanged(EAknCharSelectedTableExitButton);
+}
+void CAknSctTableNavi::NextTableL()
+{
+if(!iIdle)
+{
+iIdle = CIdle::NewL(CActive::EPriorityStandard);
+}
+iIdle->Cancel();
+iIdle->Start(TCallBack(NextTableCallBackL, this));
+}
+TInt CAknSctTableNavi::NextTableCallBackL(TAny* aThis)
+{
+((CAknSctTableNavi*)aThis)->DoNextTableL();
+return KErrNone;
+}
+void CAknSctTableNavi::DoNextTableL()
+{
+iCharMap->SetStatusChanged(EAknCharSelectedNextTableButton);
 }
 TInt CAknSctTableNavi::ButtonPosition(TInt aButtonIndex) const
 {
 // buttons behind the 1th are behavior as one button
 return (aButtonIndex==0) ? 0 : 1;
-}
-TInt CAknSctTableNavi::SetStatusChanged()
-{
-TRAPD(err, iCharMap->SetStatusChanged(EAknCharSelectedTableExitButton));
-return err;
-}
-void CAknSctTableNavi::NextTableL()
-{
-iCharMap->SetStatusChanged(EAknCharSelectedNextTableButton);
 }
 void CAknSctTableNavi::ConstructFromResourceL(TResourceReader& aReader)
 {
 // Table navi buttons.
 TInt buttonId = aReader.ReadInt16();
 TInt resId = aReader.ReadInt32();
 TResourceReader buttonReader;
 iCoeEnv->CreateResourceReaderLC(buttonReader, resId);
 CAknSctNaviButton* buttonObj = CAknSctNaviButton::NewL(*this, buttonId, buttonReader);
+buttonObj->SetObserver(this);
 iButtonArray.Append(buttonObj);
 CleanupStack::PopAndDestroy(); // buttonReader
 }
-}
-void CAknSctTableNavi::HandlePointerEventL(const TPointerEvent& aPointerEvent)
-{
-if (AknLayoutUtils::PenEnabled() && Rect().Contains(aPointerEvent.iPosition))
-{
-if (aPointerEvent.iType == TPointerEvent::EButton1Down)
-{
-iPressedButtonIndex = -1;
-for (TInt index = 0; index < iButtonArray.Count(); index++)
-{
-CAknSctNaviButton* buttonObj = iButtonArray[index];
-if(buttonObj->IsEnabled())
-{
-TRect buttonRect = buttonObj->iButtonControl->Rect();
-if (buttonRect.Contains(aPointerEvent.iPosition))
-{
-iPressedButtonIndex = index;
-}
-}
-}
-}
-else if (aPointerEvent.iType == TPointerEvent::EButton1Up)
-{
-if(iPressedButtonIndex >= 0)
-{
-CAknSctNaviButton* buttonObj = iButtonArray[iPressedButtonIndex];
-if(buttonObj->IsEnabled())
-{
-iButtonIndex = iPressedButtonIndex;
-TRect buttonRect = buttonObj->iButtonControl->Rect();
-if (buttonRect.Contains(aPointerEvent.iPosition))
-{
-switch (buttonObj->iButtonId)
-{
-case EAknSctTableNaviExit:
-{
-iExtension->iKeyOkEvent = ETrue;
-TableExitL();
-}
-return;
-case EAknSctTableNaviSpecialChar:
-case EAknSctTableNaviEmotion:
-{
-NextTableL();
-}
-return;
-default:
-break;
-}
-}
-}
-}
-}
-}
-CCoeControl::HandlePointerEventL(aPointerEvent);
 }
 TSize CAknSctTableNavi::MinimumSize()
 {
 return Rect().Size();
 buttonObj->SetEnabled(ETrue);
 }
 }
 TRAP_IGNORE(UpdateNextTableButtonL());
+}
+}
+void CAknSctTableNavi::HandleControlEventL(CCoeControl* aControl, TCoeEvent aEventType)
+{
+if(aEventType == EEventStateChanged)
+{
+for(TInt i=0; i<iButtonArray.Count(); i++)
+{
+CAknSctNaviButton* button = iButtonArray[i];
+if(button->iButtonControl == aControl)
+{
+switch(button->iButtonId)
+{
+case EAknSctTableNaviExit:
+{
+iExtension->iKeyOkEvent = ETrue;
+TableExitL();
+}
+return;
+case EAknSctTableNaviSpecialChar:
+case EAknSctTableNaviEmotion:
+{
+NextTableL();
+}
+return;
+default:
+break;
+}
+break;
+}
+}
 }
 }
 void CAknSctTableNavi::UpdateNextTableButtonL()
 else if ( iExtension->iSingleClickEnabled )
 {
 iExtension->iHighlightVisible = EFalse;
 DrawCursor();
 }
-CCoeControl::HandlePointerEventL(aPointerEvent);
 // if Stylus is lifted we clear all flags.
 if (aPointerEvent.iType == TPointerEvent::EButton1Up)
 {
 iExtension->iFlags &= (~EAknCharMapButton1DownInGrid);
 iExtension->iFlags &= (~EAknCharMapHasBeenScrolledByDrag);
 iExtension->iFlags &= (~EAknCharMapPressedDown);
-if ( !iSBFrame )
+if ( iSBFrame )
 {
-return;
+CEikScrollBar* vScrollBar = iSBFrame->VerticalScrollBar();
-}
+if(vScrollBar)
-CEikScrollBar* vScrollBar = iSBFrame->VerticalScrollBar();
+{
-if(vScrollBar)
+vScrollBar->HandlePointerEventL(aPointerEvent);
-{
+}
-vScrollBar->HandlePointerEventL(aPointerEvent);
+}
 }
 }
-}
+else
+{
+if(iExtension->iSingleClickEnabled)
+{
+iExtension->iHighlightVisible = EFalse;
+DrawCursor();
+}
+}
+CCoeControl::HandlePointerEventL(aPointerEvent);
 }
 // -----------------------------------------------------------------------------
 // CAknCharMap::SetObserver
 // Sets the observer.

branch	RCL_3
changeset 18	0aa5fbdfbc30
parent 10	9f56a4e1b8ab
child 23	3d340a0166ff