FCL/sf/mw/classicui: comparison uifw/EikStd/coctlsrc/AknButton.cpp

equal deleted inserted replaced

-:a1caeb42b3a3
+:fcdfafb36fe7
 // Fetches bitmaps from resource provider (if one exists)
 TBool FetchProviderPressedBmpsL();
 // Sets bitmaps to resource provider (if one exists)
 void SetProviderPressedBmpsL();
+//Verify new rectagle size equals to the original
+TBool TextRectSizeChanged( TRect aNewRect );
 private: // Data
 CAknButton& iButton;
 CAknButton::TTooltipPosition iTooltipPosition;
 // buffer for visually ordered text
 TBuf<255 + KAknBidiExtraSpacePerLine> iVisualText;
 TBool iFeedbackEnabled;
 TAknsItemID iBackgroundSkinIID;
 TRect iBgFrameRect;
+TRect iTextRect;
 };
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 layoutRect.LayoutRect( rect,
 AknLayoutScalable_Avkon::toolbar_button_pane_g10().LayoutLine() );
 iIconSize = layoutRect.Rect().Size();
 iFlags.Set( EUseDefaultIconSize );
 iFlags.Set( EUseDefaultMargins );
+iTextRect = TRect::EUninitialized;
 }
 // -----------------------------------------------------------------------------
 // CAknButtonExtension::~CAknButtonExtension
 // Destructor.
 KPressedFrameId,
 static_cast<MAknResourceItem*>( resourceItem ) );
 }
 }
+//Verify new rectangle size equals to the original
+TBool CAknButtonExtension::TextRectSizeChanged( TRect aNewRect )
+{
+TBool result( ETrue );
+if ( !iTextRect.IsEmpty() && !aNewRect.IsEmpty() )
+{
+if ( iTextRect.Width() == aNewRect.Width()
+&& iTextRect.Height() == aNewRect.Height() )
+{
+result = EFalse;
+}
+}
+return result;
+}
 //
 TBool CAknButtonExtension::HitRegionContains( const TPoint &aPoint,
 const CCoeControl& /*aControl*/ ) const
 {
 iHorizontalAlignment = CGraphicsContext::ELeft;
 }
 iExtension->HandleFeedbackAreaChange();
 SetFrameIDs();
-ConvertTextToVisualAndClip();
 }
 // -----------------------------------------------------------------------------
 // CAknButton::ConstructL
 // Symbian 2nd phase constructor for 1 state button.
 if ( iFlags & KAknButtonNoFrame && iFlags & KAknButtonPressedDownFrame )
 {
 TRAP_IGNORE( CreatePressedDownFrameL() );
 }
 SetFrameRects();
-ConvertTextToVisualAndClip();
 iExtension->HandleFeedbackAreaChange();
 }
 // -----------------------------------------------------------------------------
 // CAknButton::SetFlags
 // Sets the button flags
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CAknButton::SetButtonFlags( const TInt aFlags )
 {
 if ( !( iFlags & KAknButtonNoFrame ) )
 {
 if ( aFlags & KAknButtonNoFrame )
 {
 iExtension->iMargins.SetAllValuesTo( 0 );
-ConvertTextToVisualAndClip();
-}
-// aFlags does not include KAknButtonNoFrame
-else if ( iFlags & KAknButtonTextInsideFrame !=
-aFlags & KAknButtonTextInsideFrame )
-{
-ConvertTextToVisualAndClip();
 }
 }
 if ( aFlags & KAknButtonHitTest )
 {
 SetHitTest( iExtension );
 iExtension->HandleFeedbackAreaChange();
 }
 if ( aFlags & KAknButtonNoFrame && aFlags & KAknButtonPressedDownFrame )
 {
 TRAP_IGNORE ( CreatePressedDownFrameL() );
-}
-if ( iFlags & KAknButtonNoFrame && !( aFlags & KAknButtonNoFrame ) )
-{
-SetFrameIDs();
-if ( aFlags & KAknButtonTextInsideFrame )
-{
-ConvertTextToVisualAndClip();
-}
 }
 iFlags = aFlags;
 }
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CAknButton::SetTextFont( const CFont* aFont )
 {
 iFont = aFont;
-ConvertTextToVisualAndClip();
+ConvertTextToVisualAndClip( iExtension->iTextRect );
 }
 // -----------------------------------------------------------------------------
 // CAknButton::SetTextColorIds
 // Sets the color table and color index for the button text.
 // Continues drawing of the button which has only text
 // -----------------------------------------------------------------------------
 //
 void CAknButton::DrawTextButton( CWindowGc& aGc ) const
 {
+TRect textRect;
+TRect iconRect; //this is no use
+GetCurrentStateTextAndIconRect( iconRect, textRect );
 CAknButtonState* state = State();
-if ( !state || !state->HasText() )
+if ( state->TextChanged() || iExtension->TextRectSizeChanged( textRect ) )
-return;
+{
+ConvertTextToVisualAndClip( textRect );
-if ( state->TextChanged() )
-{
-ConvertTextToVisualAndClip();
-}
-TRect textRect = iExtension->iMargins.InnerRect( Rect() );
-if ( !( iFlags & KAknButtonNoFrame ) &&
-( iFlags & KAknButtonTextInsideFrame ) )
-{
-TAknLayoutRect center;
-center.LayoutRect( Rect(),
-AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() );
-textRect = center.Rect();
 }
 DrawText( aGc, textRect );
 }
 // -----------------------------------------------------------------------------
 // Continues drawing of the button which has only an icon in it
 // -----------------------------------------------------------------------------
 //
 void CAknButton::DrawIconButton( CWindowGc& aGc ) const
 {
-TRect iconRect( iExtension->iMargins.InnerRect( Rect() ) );
+TRect iconRect;
+TRect textRect;
+GetCurrentStateTextAndIconRect( iconRect, textRect );
 aGc.SetBrushStyle( CGraphicsContext::ENullBrush );
 const CGulIcon* icon = GetCurrentIcon();
-if ( !icon )
-return;
 CFbsBitmap* buttonBmp = icon->Bitmap();
 CFbsBitmap* buttonMask = icon->Mask();
 TPoint iconPoint;
 {
 CAknButtonState* state = State();
 if ( !state  || !state->HasText() )
 {
 return;
 }
-if ( state->TextChanged() )
-{
-ConvertTextToVisualAndClip();
-}
 const CGulIcon* icon = GetCurrentIcon();
-if ( !icon )
-{
-return;
-}
-TRect rect = iExtension->iMargins.InnerRect( Rect() );
 TRect iconRect;
 TRect textRect;
+GetCurrentStateTextAndIconRect( iconRect, textRect );
-if ( !( iFlags & KAknButtonNoFrame ) &&
-( iFlags & KAknButtonTextInsideFrame ))
-{
-TAknLayoutRect centerLayout;
-centerLayout.LayoutRect( rect,
-AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() );
-rect = centerLayout.Rect();
-}
 CFbsBitmap* buttonBmp = icon->Bitmap();
 CFbsBitmap* buttonMask = icon->Mask();
 TSize iconSize ( buttonBmp->SizeInPixels());
-// Set rects for icon and text according to their positioning
-// First icon rect according to icon size - rest is for text
+if ( state->TextChanged() || iExtension->TextRectSizeChanged( textRect ) )
+{
-switch ( iExtension->iTextAndIconAlignment )
+ConvertTextToVisualAndClip( textRect );
-{
+}
-case EIconBeforeText:
-if ( AknLayoutUtils::LayoutMirrored() )
-{
-textRect.SetRect( rect.iTl.iX, rect.iTl.iY,
-rect.iBr.iX - iconSize.iWidth, rect.iBr.iY);
-iconRect.SetRect( rect.iTl.iX +
-rect.Width() -iconSize.iWidth,
-rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );
-}
-else
-{
-iconRect.SetRect( rect.iTl.iX, rect.iTl.iY,
-rect.iTl.iX + iconSize.iWidth, rect.iBr.iY);
-textRect.SetRect( rect.iTl.iX + iconSize.iWidth,
-rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );
-}
-break;
-case EIconAfterText:
-if ( AknLayoutUtils::LayoutMirrored() )
-{
-iconRect.SetRect( rect.iTl.iX, rect.iTl.iY,
-rect.iTl.iX + iconSize.iWidth, rect.iBr.iY);
-textRect.SetRect( rect.iTl.iX + iconSize.iWidth,
-rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );
-}
-else
-{
-textRect.SetRect( rect.iTl.iX, rect.iTl.iY,
-rect.iBr.iX - iconSize.iWidth, rect.iBr.iY);
-iconRect.SetRect( rect.iTl.iX +
-rect.Width() -iconSize.iWidth,
-rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );
-}
-break;
-case EIconOverText:
-iconRect.SetRect( rect.iTl.iX, rect.iTl.iY,
-rect.iBr.iX, rect.iTl.iY + iconSize.iHeight );
-textRect.SetRect( rect.iTl.iX, rect.iTl.iY + iconSize.iHeight,
-rect.iBr.iX, rect.iBr.iY );
-break;
-case EIconUnderText:
-textRect.SetRect( rect.iTl.iX, rect.iTl.iY,
-rect.iBr.iX, rect.iBr.iY - iconSize.iHeight );
-iconRect.SetRect( rect.iTl.iX, rect.iBr.iY - iconSize.iHeight,
-rect.iBr.iX, rect.iBr.iY );
-break;
-case EOverlay:
-{
-textRect = rect;
-iconRect = rect;
-}
-break;
-default:
-return;
-}
 // Draw icon
 TPoint iconPoint;
 switch ( iExtension->iHorizontalIconAlignment )
 {
 case ERight:
 }
 iHelpNote = CAknInfoPopupNoteController::NewL();
 iHelpNote->SetTimeDelayBeforeShow( iHelpNoteWaitInterval );
 iHelpNote->SetTimePopupInView( iHelpNoteInViewInterval );
 iHelpNote->SetTooltipModeL( ETrue );
+//When state changed, empty rect to enable recalculate the
+//visual text if text exists in current state.
+if ( !(iExtension->iTextRect.IsEmpty()) )
+{
+iExtension->iTextRect = TRect::EUninitialized;
+}
 }
 }
 // -----------------------------------------------------------------------------
 // CAknButton::SetFrameIDs
 // -----------------------------------------------------------------------------
 // CAknButton::ConvertTextToVisualAndClip
 // -----------------------------------------------------------------------------
 //
-void CAknButton::ConvertTextToVisualAndClip() const
+void CAknButton::ConvertTextToVisualAndClip( const TRect& aRect ) const
 {
 CAknButtonState* state = State();
 if ( !state || !state->HasText() )
 {
 if ( state )
 state->ResetTextChanged();
 }
 return;
 }
-TRect textRect = iExtension->iMargins.InnerRect( Rect() );
+TRect textRect( aRect );
+//Using given rect to calculate the visual text if it's not empty.
-if ( !( iFlags & KAknButtonNoFrame ) &&
+if ( !textRect.IsEmpty() )
-( iFlags & KAknButtonTextInsideFrame ) )
+{
-{
+iExtension->iTextRect = textRect;
-TAknLayoutRect center;
+}
-center.LayoutRect( Rect(),
+//Calculate text area.
-AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() );
+//This branch means that it's the first calling after the state changed
+//or client using new font before this is shown.
-textRect = center.Rect();
+else
-}
+{
+TRect iconRect;
+GetCurrentStateTextAndIconRect( iconRect, textRect );
+iExtension->iTextRect = textRect;
+}
 TInt clipWidth = textRect.Width();
 const CFont* font = iFont;
 if ( !font )
 {
 iExtension->iVisualText,
 *font,
 clipWidth,
 clipWidth );
 }
+// -----------------------------------------------------------------------------
+// CAknButton::GetCurrentStateTextAndIconRect()
+// Get rect for icon and text of the current button state .
+// -----------------------------------------------------------------------------
+//
+void CAknButton::GetCurrentStateTextAndIconRect( TRect& aIconRect,
+TRect& aTextRect ) const
+{
+TRect iconRect( TRect::EUninitialized ) ;
+TRect textRect( TRect::EUninitialized );
+CAknButtonState* state = State();
+//Return directly if no state
+if ( !state )
+{
+aIconRect = iconRect;
+aTextRect = textRect;
+return;
+}
+TBool hasText( state->HasText() );
+TBool hasIcon( EFalse );
+const CGulIcon* icon = GetCurrentIcon();
+if ( icon )
+{
+hasIcon = ETrue;
+}
+TRect rect = iExtension->iMargins.InnerRect( Rect() );
+//Icon area is not effected by the frame flags.
+if ( hasIcon )
+{
+iconRect = rect;
+}
+if ( !( iFlags & KAknButtonNoFrame ) &&
+( iFlags & KAknButtonTextInsideFrame ))
+{
+TAknLayoutRect centerLayout;
+centerLayout.LayoutRect( rect,
+AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() );
+rect = centerLayout.Rect();
+}
+if ( hasText )
+{
+textRect = rect;
+}
+if ( hasText && hasIcon )
+{
+CFbsBitmap* buttonBmp = icon->Bitmap();
+CFbsBitmap* buttonMask = icon->Mask();
+TSize iconSize ( buttonBmp->SizeInPixels());
+// Set rects for icon and text according to their positioning
+// First icon rect according to icon size - rest is for text
+switch ( iExtension->iTextAndIconAlignment )
+{
+case CAknButton::EIconBeforeText:
+if ( AknLayoutUtils::LayoutMirrored() )
+{
+textRect.SetRect( rect.iTl.iX, rect.iTl.iY,
+rect.iBr.iX - iconSize.iWidth, rect.iBr.iY);
+iconRect.SetRect( rect.iTl.iX +
+rect.Width() -iconSize.iWidth,
+rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );
+}
+else
+{
+iconRect.SetRect( rect.iTl.iX, rect.iTl.iY,
+rect.iTl.iX + iconSize.iWidth, rect.iBr.iY);
+textRect.SetRect( rect.iTl.iX + iconSize.iWidth,
+rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );
+}
+break;
+case CAknButton::EIconAfterText:
+if ( AknLayoutUtils::LayoutMirrored() )
+{
+iconRect.SetRect( rect.iTl.iX, rect.iTl.iY,
+rect.iTl.iX + iconSize.iWidth, rect.iBr.iY);
+textRect.SetRect( rect.iTl.iX + iconSize.iWidth,
+rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );
+}
+else
+{
+textRect.SetRect( rect.iTl.iX, rect.iTl.iY,
+rect.iBr.iX - iconSize.iWidth, rect.iBr.iY);
+iconRect.SetRect( rect.iTl.iX +
+rect.Width() -iconSize.iWidth,
+rect.iTl.iY, rect.iBr.iX, rect.iBr.iY );
+}
+break;
+case CAknButton::EIconOverText:
+iconRect.SetRect( rect.iTl.iX, rect.iTl.iY,
+rect.iBr.iX, rect.iTl.iY + iconSize.iHeight );
+textRect.SetRect( rect.iTl.iX, rect.iTl.iY + iconSize.iHeight,
+rect.iBr.iX, rect.iBr.iY );
+break;
+case CAknButton::EIconUnderText:
+textRect.SetRect( rect.iTl.iX, rect.iTl.iY,
+rect.iBr.iX, rect.iBr.iY - iconSize.iHeight );
+iconRect.SetRect( rect.iTl.iX, rect.iBr.iY - iconSize.iHeight,
+rect.iBr.iX, rect.iBr.iY );
+break;
+case CAknButton::EOverlay:
+{
+textRect = rect;
+iconRect = rect;
+}
+break;
+default:
+break; //Do nothing.
+}
+}
+aTextRect = textRect;
+aIconRect = iconRect;
+}
 // -----------------------------------------------------------------------------
 // CAknButton::TouchArea
 // Returns the button touchable area.
 // -----------------------------------------------------------------------------
 //

branch	RCL_3
changeset 51	fcdfafb36fe7
parent 50	a1caeb42b3a3
child 55	aecbbf00d063