diff -r b1ea1642412e -r ac7e4d1d9209 textinput/peninputarc/inc/pensrvcliinc/penuiwndctrl.h --- a/textinput/peninputarc/inc/pensrvcliinc/penuiwndctrl.h Thu Jul 15 19:01:13 2010 +0300 +++ b/textinput/peninputarc/inc/pensrvcliinc/penuiwndctrl.h Thu Aug 19 10:15:25 2010 +0300 @@ -196,12 +196,51 @@ void UpdateCursor(TBool aOnFlag,const CFbsBitmap* aCursorBmp,const TRect& aPos); void SetPopupArea(const TRect& aRect, TBool aFlag); void UpdateICFArea(const CFbsBitmap* aBmp,const TPoint& aPos); - void UpdateChangedArea(const CFbsBitmap* aBmp,const TRect& aRect,TBool aFlag); - void UpdateBubble(const CFbsBitmap* aBmp,const CFbsBitmap* aMaskBmp,const TRect& aPos,TBool aFlag); + + /** + * Update the bubble area list + * + * @since S60 v5.0 + * @param aCtrl the Ctrl's address + * @param aBmp the bubble bitmap's address + * @param aRect the bubble rect + * @param aFlag ETrue means add bubble area and + * EFalse means remove bubble area + * @return void + */ + void UpdateChangedArea( const TUint32 aCtrl, + const CFbsBitmap* aBmp, const TRect& aRect, TBool aFlag ); + + /** + * Update the bubble area list + * + * @since S60 v5.0 + * @param aCtrl the Ctrl's address + * @param aBmp the bubble bitmap's address + * @param aMaskBmp the bubble mask bitmap's address + * @param aPos the bubble rect + * @param aFlag ETrue means add bubble area and + * EFalse means remove bubble area + * @return void + */ + void UpdateBubble( const TUint32 aCtrl, + const CFbsBitmap* aBmp, const CFbsBitmap* aMaskBmp, + const TRect& aPos, TBool aFlag ); + void Clean(); void HandleNGASpecificSignal(TInt aEventType, const TDesC& aEventData); void LiftUpPriority(); + + /** + * Update the cursor color + * + * @since S60 v5.0 + * @param none + * @return void + */ + void SetCursorColor(); + public: // Functions from base classes. /** @@ -302,6 +341,12 @@ CFbsBitmap* iChangedBmp; RPointerArray iBubblesArea; RPointerArray iBubblesMaskArea; + + /** + * An array of the Controls' addresses + */ + RArray iBubblesCtrl; + RArray iBubblesPos; TPoint iCursorPos; @@ -335,6 +380,11 @@ TBool iNotUpdating; CCursorWindow* iCursorWnd; + /** + * The cursor's color + */ + TRgb iCursorColor; + friend class CCursorWindow; }; class CInternalBkCtrl : public CCoeControl