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

equal deleted inserted replaced

-:aecbbf00d063
+:d48ab3b357f1
 /*
-* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 // 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;
 CAknPictographInterface* iPictographInterface; // not owned
 TBitFlags iFlags;
 MTouchFeedback* iFeedback;
 CFbsBitmap* iPressedDownBmp;
 CFbsBitmap* iPressedDownBmpMask;
 CAknResourceProvider* iResourceProvider;
+//Previous touch down or drag position, valid only with pressed state.
+TPoint iPrePointerPos;
+CAknsFrameBackgroundControlContext* iHighlightContext;
+// buffer for visually ordered text
+TBuf<255 + KAknBidiExtraSpacePerLine> iVisualText;
+TBool iFeedbackEnabled;
+TAknsItemID iBackgroundSkinIID;
+TRect iBgFrameRect;
+TRect iTextRect;
 };
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 iUnderlineStyle( EUnderlineOff ),
 iFrameAndCenterIds( 2 ),
 iVerticalIconAlignment( CAknButton::ECenter ),
 iHorizontalIconAlignment( CAknButton::ECenter ),
 iTextAndIconAlignment( CAknButton::EIconBeforeText ),
-iResourceProvider( 0 )
+iResourceProvider( 0 ),
+iFeedbackEnabled( ETrue )
 {
 // default margins, these are applied to both text and icon
 iMargins.SetAllValuesTo(
 AknLayoutScalable_Avkon::aid_value_unit2().LayoutLine().iW / 10 );
 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.
 {
 delete iLongPressTimer;
 iPictographInterface = NULL; // not owned
 iFrameAndCenterIds.Close();
 DeletePressedBmps();
+delete iHighlightContext;
 }
 // -----------------------------------------------------------------------------
 // CAknButtonExtension::NewL
 // Symbian two-phased constructor.
 iFrameAndCenterIds.AppendL( KAknsIIDQsnFrButtonPressed );
 iFrameAndCenterIds.AppendL( KAknsIIDQsnFrButtonCenterPressed );
 // Latched dimmed frame and center
 iFrameAndCenterIds.AppendL( KAknsIIDQsnFrButtonInactive );
 iFrameAndCenterIds.AppendL( KAknsIIDQsnFrButtonCenterInactive );
+if ( !iHighlightContext )
+{
+iHighlightContext = CAknsFrameBackgroundControlContext::NewL(
+KAknsIIDNone, TRect(), TRect(), EFalse );
+iHighlightContext->SetFrame( KAknsIIDQsnFrButtonHighlight );
+iHighlightContext->SetCenter( KAknsIIDQsnFrButtonHighlightCenter );
+}
 }
 // -----------------------------------------------------------------------------
 // CAknButtonExtension::StartLongPressTimerL
 // Starts the long press timer. The timer is constructed when used for the
 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
 return retval;
 }
 void CAknButtonExtension::HandleFeedbackAreaChange()
 {
+if ( !iFeedbackEnabled )
+{
+return;
+}
 // it is possible that feedback does not exist, eg. while booting.
 // try getting one, and give up if that fails.
 if ( !iFeedback )
 {
 iFeedback = MTouchFeedback::Instance();
 TAknsItemID iId;
 TAknsItemID iDimmedId;
 TAknsItemID iPressedId;
 TAknsItemID iHoverId;
 TScaleMode iScaleMode;
+TBool iFlagsChanged;
+TBool iTextChanged;
 };
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 {
 delete iText;
 iText = NULL;
 iText = aText.AllocL();
+iExtension->iTextChanged = ETrue;
 }
 // -----------------------------------------------------------------------------
 // CAknButtonState::SetHelpTextL
 // Sets the text inside the help note
 // Sets state flags.
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CAknButtonState::SetFlags( const TInt aFlags )
 {
+if ( ( iFlags & KAknButtonStateHasLatchedFrame ) !=
+( aFlags & KAknButtonStateHasLatchedFrame ) )
+{
+iExtension->iFlagsChanged = ETrue;
+}
 iFlags = aFlags;
 }
 // -----------------------------------------------------------------------------
 // CAknButtonState::UpdateIconL
 LoadButtonIcon( iIcon );
 LoadButtonIcon( iDimmedIcon );
 LoadButtonIcon( iPressedIcon );
 LoadButtonIcon( iHoverIcon );
 }
+// -----------------------------------------------------------------------------
+// CAknButtonState::UpdateExtensionInfoL
+// Updates extension information.
+// -----------------------------------------------------------------------------
+void CAknButtonState::UpdateExtensionInfoL( TInt aResource )
+	{
+	if ( iExtension )
+		{
+		iExtension->ConfigureExtensionFromResourceL( aResource );
+		LoadButtonIcon( iIcon );
+	    LoadButtonIcon( iDimmedIcon );
+	    LoadButtonIcon( iPressedIcon );
+	    LoadButtonIcon( iHoverIcon );
+		}
+	}
 // -----------------------------------------------------------------------------
 // CAknButtonState::SizeChanged
 // Scales function graphics to the given size
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 void CAknButtonState::SetGeneratedDimmedIcon( TBool aDimmedIconCreatedByButton )
 {
 iExtension->iGeneratedDimmedIcon = aDimmedIconCreatedByButton;
 }
+// -----------------------------------------------------------------------------
+// CAknButtonState::FlagsChanged
+// Returns ETrue if button state flags are changed so that
+// KAknStateHasLatchedDownFrame is setted or cleared
+// -----------------------------------------------------------------------------
+TBool CAknButtonState::FlagsChanged()
+{
+return iExtension->iFlagsChanged;
+}
+// -----------------------------------------------------------------------------
+// CAknButtonState::ResetFlagsChanged
+// Frame has been updated so boolean iFlagsChanged can be set to EFalse
+// -----------------------------------------------------------------------------
+void CAknButtonState::ResetFlagsChanged()
+{
+iExtension->iFlagsChanged = EFalse;
+}
+// -----------------------------------------------------------------------------
+// CAknButtonState::TextChanged
+// Returns ETrue if text is changed and button's visual text has
+// not been updated.
+// -----------------------------------------------------------------------------
+TBool CAknButtonState::TextChanged()
+{
+return iExtension->iTextChanged;
+}
+// -----------------------------------------------------------------------------
+// CAknButtonState::ResetTextChanged
+// Visual text has been updated so boolean iTextChanged can be set to EFalse
+// -----------------------------------------------------------------------------
+void CAknButtonState::ResetTextChanged()
+{
+iExtension->iTextChanged = EFalse;
+}
 // -----------------------------------------------------------------------------
 // CAknButtonState::Extension
 // -----------------------------------------------------------------------------
 //
 if ( AknsUtils::GetCachedColor( AknsUtils::SkinInstance(), textColor,
 iTextColorTableId, iTextColorIndex ) == KErrNone )
 {
 OverrideColorL( EColorButtonText, textColor );
 }
+if ( AknsUtils::GetCachedColor( AknsUtils::SkinInstance(), textColor,
+iTextColorTableId, EAknsCIQsnTextColorsCG84 ) == KErrNone )
+{
+OverrideColorL( EColorButtonTextPressed, textColor );
+}
 if ( !iStates )
 {
 iStates = new ( ELeave ) CArrayPtrFlat<CAknButtonState>( 2 );
 }
 if ( iFlags & KAknButtonTextLeft )
 {
 iHorizontalAlignment = CGraphicsContext::ELeft;
 }
 iExtension->HandleFeedbackAreaChange();
+SetFrameIDs();
 }
 // -----------------------------------------------------------------------------
 // CAknButton::ConstructL
 // Symbian 2nd phase constructor for 1 state button.
 iTextColorTableId, iTextColorIndex ) == KErrNone )
 {
 TRAP_IGNORE( OverrideColorL( EColorButtonText, textColor ) );
 }
+if ( AknsUtils::GetCachedColor( AknsUtils::SkinInstance(), textColor,
+iTextColorTableId, EAknsCIQsnTextColorsCG84 ) == KErrNone )
+{
+TRAP_IGNORE( OverrideColorL( EColorButtonTextPressed, textColor ) );
+}
 // generated pressed frame has to be regenerated
 if ( iFlags & KAknButtonNoFrame && iFlags & KAknButtonPressedDownFrame )
 {
 iExtension->DeletePressedBmps();
 TRAP_IGNORE( CreatePressedDownFrameL() );
 StopKeyRepeatTimer();
 StopLongPressTimer();
 HideHelp();
 iButtonPressed = EFalse;
 }
 if ( aDimmed )
 {
 iExtension->iFlags.Set( CAknButtonExtension::EDimmed );
 }
 else
 {
 iExtension->iFlags.Clear( CAknButtonExtension::EDimmed );
 }
-if ( iExtension->iFeedback )
+if ( iExtension->iFeedbackEnabled && iExtension->iFeedback )
 {
 if ( aDimmed )
 {
 iExtension->iFeedback->MoveFeedbackAreaToFirstPriority( this, 0 );
 }
 // None of states has help text, CCoeControl::SetDimmed can be used
 if ( !hasHelp )
 {
 CCoeControl::SetDimmed( aDimmed );
 }
+SetFrameIDs();
 }
 // -----------------------------------------------------------------------------
 // CAknButton::OfferKeyEventL
 // Handles key events.
 if ( !iButtonPressed )
 {
 // show press changes
 iButtonPressed = ETrue;
+iExtension->iPrePointerPos.SetXY( -1, -1 );
+SetFrameIDs();
 if ( NeedsRedrawWhenPressed() )
 {
 DrawNow();
 }
 }
 else if ( aType == EEventKeyUp )
 {
 if ( iButtonPressed )
 {
 iButtonPressed = EFalse;
+SetFrameIDs();
 if ( NeedsRedrawWhenPressed() )
 {
 DrawNow();
 }
 CAknButton::ELongPressEndedEvent ) );
 }
 iExtension->iFlags.Clear( CAknButtonExtension::ELongPressReported );
 iExtension->iFlags.Clear( CAknButtonExtension::EKeyRepeatEventReported );
 }
-if ( iKeyDownReported && RequestExit() && Observer() )
+TInt reported = iKeyDownReported;
+iKeyDownReported = EFalse;
+if ( reported && RequestExit() && Observer() )
 {
 Observer()->HandleControlEventL( this,
 MCoeControlObserver::EEventRequestExit );
 }
-iKeyDownReported = EFalse;
 }
 // we don't want aKeyEvent to go somewhere else :)
 return EKeyWasConsumed;
 }
 EXPORT_C void CAknButton::MakeVisible( TBool aVisible )
 {
 if ( aVisible != IsVisible() )
 {
 CAknControl::MakeVisible( aVisible );
-if ( iExtension->iFeedback )
+if ( iExtension->iFeedbackEnabled && iExtension->iFeedback )
 {
 if ( aVisible )
 {
 iExtension->iFeedback->MoveFeedbackAreaToFirstPriority( this,
 0 );
 this,
 aVisible && !IsDimmed() );
 }
 CAknButtonState* state = State();
-if ( !aVisible && state && state->HasHelp() )
+if ( !aVisible && iButtonPressed )
+{
+ResetState();
+}
+else if ( !aVisible && state && state->HasHelp() )
 {
 HideHelp();
 }
 }
 }
 // this control.
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CAknButton::SizeChanged()
 {
+//Reset state if observer modified the rectangel.
+if ( iButtonPressed && !Rect().Contains( iExtension->iPrePointerPos ) )
+{
+ResetState();
+}
 // If default icon size from LAF is used re-request that, otherwise trust
 // that size will be updated by the utilising application.
 if ( iExtension->iFlags.IsSet( CAknButtonExtension::EUseDefaultIconSize ) )
 {
 if ( iFlags & KAknButtonNoFrame && !State()->HasText() )
 // Pressed down frame has to be regenerated
 if ( iFlags & KAknButtonNoFrame && iFlags & KAknButtonPressedDownFrame )
 {
 TRAP_IGNORE( CreatePressedDownFrameL() );
 }
+SetFrameRects();
 iExtension->HandleFeedbackAreaChange();
 }
 // -----------------------------------------------------------------------------
 if ( iButtonPressed )
 {
 ResetState();
 }
 return;
+}
+if ( iExtension )
+{
+iExtension->iPrePointerPos = aPointerEvent.iPosition;
 }
 TBool buttonEvent( TouchArea().Contains( aPointerEvent.iPosition ) );
 CAknButtonState* state = State();
 if ( !state )
 {
 else if ( buttonEvent )
 {
 if ( !iButtonPressed )
 {
 iButtonPressed = ETrue;
+SetFrameIDs();
 // feedback/basic on down event, if hit test is
 // used. Area registry is used for rectangular
 // buttons
 if ( ( iFlags & KAknButtonHitTest )
 && !IsDimmed()
 if ( iFlags & KAknButtonReportOnKeyDown )
 {
 // State is changed on button down event
 ChangeState( EFalse );
-redrawNeeded = ETrue;
+redrawNeeded = EFalse;
+DrawNow();  //Redraw before noticing the observer for observer might open dialog
 if ( Observer() )
 {
 Observer()->HandleControlEventL( this,
 MCoeControlObserver::EEventStateChanged );
 }
 if ( !buttonEvent && iButtonPressed )
 {
 // Redraw button, if needed
 if ( NeedsRedrawWhenPressed() )
 {
-iButtonPressed = EFalse;
 redrawNeeded = ETrue;
 }
 iButtonPressed = EFalse;
+SetFrameIDs();
 StopKeyRepeatTimer();
 StopLongPressTimer();
 if ( !IsFocused() )
 // Pointer is dragged back into button area
 else if ( buttonEvent && !iButtonPressed && !IsDimmed() )
 {
 iButtonPressed = ETrue;
+SetFrameIDs();
 // Redraw button, if needed
 if ( NeedsRedrawWhenPressed() )
 {
 redrawNeeded = ETrue;
 break;
 }
 case TPointerEvent::EButton1Up:
 {
+if ( iExtension )
+{
+iExtension->iPrePointerPos.SetXY( -1, -1 );
+}
 iNumberOfDragEvents = 0;
 HideHelp();
 StopKeyRepeatTimer();
 StopLongPressTimer();
 {
 redrawNeeded = ETrue;
 }
 }
 iButtonPressed = EFalse;
+SetFrameIDs();
 }
+TBool hasDrawn( EFalse );
 if ( buttonEvent && !IsDimmed() )
 {
 // feedback/BasicButton on up event, if hit test is
 // used. Area registry is used for rectangular
 // buttons
 if ( !( iFlags & KAknButtonReportOnKeyDown ) &&
 !( iExtension->iFlags.IsSet( CAknButtonExtension::ELongPressReported ) ) &&
 !( iExtension->iFlags.IsSet( CAknButtonExtension::EKeyRepeatEventReported ) ) )
 {
 ChangeState( EFalse );
-redrawNeeded = ETrue;
+if ( !hasDrawn )
+	{
+	                        DrawNow();
+	                        hasDrawn = ETrue;
+	}
 if ( Observer() )
 {
 Observer()->HandleControlEventL( this,
 MCoeControlObserver::EEventStateChanged );
 }
 }
 else
 {
 if ( iExtension->iFlags.IsSet( CAknButtonExtension::ELongPressReported ) && Observer() )
 {
+if ( redrawNeeded && !hasDrawn )
+	{
+	DrawNow();
+	hasDrawn = ETrue;
+	}
 Observer()->HandleControlEventL( this,
 static_cast<MCoeControlObserver::TCoeEvent>(
 CAknButton::ELongPressEndedEvent ) );
 }
 iExtension->iFlags.Clear( CAknButtonExtension::ELongPressReported );
 iExtension->iFlags.Clear( CAknButtonExtension::EKeyRepeatEventReported );
 }
 if ( RequestExit() && Observer() )
 {
+if ( redrawNeeded && !hasDrawn )
+	{
+	DrawNow();
+	hasDrawn = ETrue;
+	}
 Observer()->HandleControlEventL( this,
 MCoeControlObserver::EEventRequestExit );
 }
 }
 if ( !buttonEvent && !IsDimmed() && Observer() )
 {
+if ( redrawNeeded && !hasDrawn )
+	   {
+	   DrawNow();
+	   hasDrawn = ETrue;
+	   }
 Observer()->HandleControlEventL( this,
 MCoeControlObserver::EEventRequestCancel );
 if ( iExtension->iFlags.IsSet( CAknButtonExtension::ELongPressReported ) )
 {
 CAknButton::ELongPressEndedEvent ) );
 iExtension->iFlags.Clear( CAknButtonExtension::ELongPressReported );
 iExtension->iFlags.Clear( CAknButtonExtension::EKeyRepeatEventReported );
 }
 }
+if ( hasDrawn )
+	{
+	redrawNeeded = EFalse;
+	}
 break;
 }
 default:
 break;
 //
 EXPORT_C void CAknButton::PositionChanged()
 {
 if ( iExtension ) iExtension->HandleFeedbackAreaChange();
 CAknControl::PositionChanged();
+//Reset state if observer moved button position.
+if ( iButtonPressed && iExtension && !Rect().Contains( iExtension->iPrePointerPos ) )
+	{
+	ResetState();
+	}
+SetFrameRects();
 }
 // -----------------------------------------------------------------------------
 // CAknButton::FocusChanged
 // This function is called whenever a control gains or loses focus.
 EXPORT_C void CAknButton::FocusChanged( TDrawNow aDrawNow )
 {
 if ( !IsFocused() && iButtonPressed )
 {
 iButtonPressed = EFalse;
+SetFrameIDs();
 iKeyDownReported = EFalse;
 }
 if ( IsVisible() )
 {
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CAknButton::Draw( const TRect& /*aRect*/ ) const
 {
 TRect rect( Rect() );
-TAknLayoutRect centerLayout;
-centerLayout.LayoutRect( rect,
-AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() );
-TRect innerRect( centerLayout.Rect() );
 TRect highlightRect( HighlightRect() );
 CWindowGc& gc = SystemGc();
 CAknButtonState* state = State();
-// Skin ids are determined here (a bit too early than necessary) so that
+if ( !( iFlags & KAknButtonNoFrame ) && !iButtonPressed && state &&
-// we can avoid doing the same thing in DrawMaskedL.
+state->FlagsChanged() )
-if ( !( iFlags & KAknButtonNoFrame ) )
+{
-{
+SetFrameIDs();
-TInt frameIdIndex = KFrameId;
-if ( iButtonPressed )
-{
-frameIdIndex = KPressedFrameId;
-}
-else if ( state && state->Flags() & KAknButtonStateHasLatchedFrame )
-{
-if ( IsDimmed() )
-{
-// dimmed latched frame
-frameIdIndex = KLatchedDimmedFrameId;
-}
-else
-{
-// latched down
-frameIdIndex = KLatchedFrameId;
-}
-}
-else if ( IsDimmed())
-{
-// dimmed frame
-frameIdIndex = KDimmedFrameId;
-}
-if ( SkinIID( frameIdIndex ) != KAknsIIDNone )
-{
-iBgContext->SetFrame( SkinIID( frameIdIndex ) );
-iBgContext->SetCenter( SkinIID( ++frameIdIndex ) );
-iBgContext->SetFrameRects( rect, innerRect );
-}
 }
 if ( !iExtension->iFlags.IsSet( CAknButtonExtension::EUseAdditionalMask ) )
 {
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 }
 if ( IsFocused() && !highlightRect.IsEmpty() )
 {
-iBgContext->SetFrame( KAknsIIDQsnFrButtonHighlight );
-iBgContext->SetCenter( KAknsIIDQsnFrButtonHighlightCenter );
-iBgContext->SetFrameRects( rect, innerRect );
 // frame graphics
-if ( !AknsDrawUtils::Background( skin, iBgContext, NULL, gc,
+if ( !AknsDrawUtils::Background( skin,
-rect, KAknsDrawParamNoClearUnderImage ) )
+iExtension->iHighlightContext, NULL, gc, rect,
+KAknsDrawParamNoClearUnderImage ) )
 {
 gc.SetBrushColor( KRgbRed );
 gc.SetBrushStyle( CGraphicsContext::ESolidBrush );
 gc.DrawRect( rect );
 }
 {
 newIndex = aStateIndex % iStates->Count();
 }
 TRAP_IGNORE( SetStateIndexL( newIndex ) );
+SetFrameIDs();
 if ( aDrawNow )
 {
 DrawNow();
 }
 }
 // CAknButton::SetFlags
 // Sets the button flags
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CAknButton::SetButtonFlags( const TInt aFlags )
 {
-if ( !(iFlags & KAknButtonNoFrame ) && aFlags & KAknButtonNoFrame )
+if ( !( iFlags & KAknButtonNoFrame ) )
 {
-iExtension->iMargins.SetAllValuesTo( 0 );
+if ( aFlags & KAknButtonNoFrame )
+{
+iExtension->iMargins.SetAllValuesTo( 0 );
+}
 }
 if ( aFlags & KAknButtonHitTest )
 {
 SetHitTest( iExtension );
 iExtension->HandleFeedbackAreaChange();
 }
 if ( aLatchedDimmedCenterId != KAknsIIDDefault )
 {
 skinIds[KLatchedDimmedCenterId] = aLatchedDimmedCenterId;
 }
+SetFrameIDs();
 }
 // -----------------------------------------------------------------------------
 // CAknButton::SetBackgroundIds
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CAknButton::SetTextFont( const CFont* aFont )
 {
 iFont = aFont;
+ConvertTextToVisualAndClip( iExtension->iTextRect );
 }
 // -----------------------------------------------------------------------------
 // CAknButton::SetTextColorIds
 // Sets the color table and color index for the button text.
 {
 newIndex = 0;
 }
 TRAP_IGNORE( SetStateIndexL( newIndex ) );
+// Updating background context might be needed if states flags differ
+SetFrameIDs();
 if ( aDrawNow )
 {
 DrawNow();
 }
 EXPORT_C void CAknButton::ResetState( )
 {
 StopKeyRepeatTimer();
 StopLongPressTimer();
 iButtonPressed = EFalse;
+SetFrameIDs();
 HideHelp();
 if ( iExtension )
 {
 if ( iExtension->iFlags.IsSet( CAknButtonExtension::ELongPressReported ) && Observer() )
 {
 // 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 );
+}
+DrawText( aGc, textRect );
+}
+// -----------------------------------------------------------------------------
+// CAknButton::DrawText
+// Continues drawing of the button which has text
+// -----------------------------------------------------------------------------
+//
+void CAknButton::DrawText( CWindowGc& aGc, TRect& aTextRect ) const
+{
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-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();
-}
 aGc.SetBrushStyle( CGraphicsContext::ENullBrush );
 TRgb penColor;
 TRgb brushColor;
 }
 aGc.UseFont( font );
 aGc.SetUnderlineStyle( iExtension->iUnderlineStyle );
-// buffer for visually ordered text
-TBuf<255 + KAknBidiExtraSpacePerLine> visualText;
-TInt clipWidth = textRect.Width();
-// bidi processing - using AknBidiTextUtils.
-AknBidiTextUtils::ConvertToVisualAndClip(
-state->Text(),
-visualText,
-*font,
-clipWidth,
-clipWidth );
 TInt baselineOffset = 0;
 switch ( iVerticalAlignment )
 {
 case ETop:
 baselineOffset = font->AscentInPixels();
 break;
 case EBottom:
-baselineOffset = textRect.Height();
+baselineOffset = aTextRect.Height();
 break;
 default:  // centered
 baselineOffset = font->AscentInPixels() +
-( textRect.Height() - font->AscentInPixels() ) / 2;
+( aTextRect.Height() - font->AscentInPixels() ) / 2;
 }
 CGraphicsContext::TTextAlign horAlignment = iHorizontalAlignment;
-aGc.DrawText( visualText, textRect, baselineOffset, horAlignment );
+aGc.DrawText( iExtension->iVisualText, aTextRect, baselineOffset,
+horAlignment );
 if ( iExtension->iPictographInterface )
 {
 // For Japanese variant only
 iExtension->iPictographInterface->Interface()->DrawPictographsInText(
-aGc, *font, visualText, textRect, baselineOffset, horAlignment );
+aGc, *font, iExtension->iVisualText, aTextRect, baselineOffset,
+horAlignment );
 }
 }
 // -----------------------------------------------------------------------------
 // CAknButton::DrawIconButton
 // 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;
 }
 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:
 else if ( buttonBmp )
 {
 aGc.BitBlt( iconPoint, buttonBmp, iconRect.Size() );
 }
-const CFont* font = iFont;
+DrawText( aGc, textRect );
-if ( !font )
-{
-font = iCoeEnv->NormalFont();
-}
-aGc.UseFont( font );
-TRgb penColor;
-TRgb brushColor;
-GetTextColors( penColor, brushColor );
-aGc.SetPenColor( penColor );
-aGc.SetBrushColor( brushColor );
-aGc.SetUnderlineStyle( iExtension->iUnderlineStyle );
-TBuf<255 + KAknBidiExtraSpacePerLine> visualText; // buffer for visually ordered text
-TInt clipWidth = textRect.Width();
-// bidi processing - using AknBidiTextUtils.
-AknBidiTextUtils::ConvertToVisualAndClip(
-state->Text(),
-visualText,
-*font,
-clipWidth,
-clipWidth );
-TInt baselineOffset = 0;
-switch ( iVerticalAlignment )
-{
-case ETop:
-baselineOffset = font->AscentInPixels();
-break;
-case EBottom:
-baselineOffset = textRect.Height();
-break;
-default:  // centered
-baselineOffset = font->AscentInPixels() +
-( textRect.Height() - font->AscentInPixels() ) / 2;
-}
-CGraphicsContext::TTextAlign horAlignment = iHorizontalAlignment;
-aGc.DrawText( visualText, textRect, baselineOffset, horAlignment );
-if ( iExtension->iPictographInterface )
-{
-// For Japanese variant only
-iExtension->iPictographInterface->Interface()->DrawPictographsInText(
-aGc, *font, visualText, textRect, baselineOffset, horAlignment );
-}
 }
 // -----------------------------------------------------------------------------
 // Starts the long press timer.
 // -----------------------------------------------------------------------------
 delete state;
 state = NULL;
 iStates->Delete( iStateIndex );
 iStateIndex <= 0 ? iStateIndex = 0 : iStateIndex--;
+SetFrameIDs();
 DrawNow();
 }
 }
 }
 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
+// Sets frame ids for background context
+// -----------------------------------------------------------------------------
+//
+void CAknButton::SetFrameIDs() const
+{
+// Skin ids are determined here (a bit too early than necessary) so that
+// we can avoid doing the same thing in DrawMaskedL.
+CAknButtonState* state = State();
+if ( !( iFlags & KAknButtonNoFrame ) )
+{
+TInt frameIdIndex = KFrameId;
+if ( iButtonPressed )
+{
+frameIdIndex = KPressedFrameId;
+}
+else if ( state && state->Flags() & KAknButtonStateHasLatchedFrame )
+{
+if ( IsDimmed() )
+{
+// dimmed latched frame
+frameIdIndex = KLatchedDimmedFrameId;
+}
+else
+{
+// latched down
+frameIdIndex = KLatchedFrameId;
+}
+}
+else if ( IsDimmed() )
+{
+// dimmed frame
+frameIdIndex = KDimmedFrameId;
+}
+TAknsItemID skinIID( SkinIID( frameIdIndex ) );
+// Only change the background frame graphics if necessary.
+if ( skinIID != KAknsIIDNone &&
+skinIID != iExtension->iBackgroundSkinIID )
+{
+iBgContext->SetFrame( skinIID );
+iBgContext->SetCenter( SkinIID( ++frameIdIndex) );
+iExtension->iBackgroundSkinIID = skinIID;
+}
+}
+if ( state )
+{
+state->ResetFlagsChanged();
+}
+}
+// -----------------------------------------------------------------------------
+// CAknButton::SetFrameRects
+// -----------------------------------------------------------------------------
+//
+void CAknButton::SetFrameRects()
+{
+TRect rect( Rect() );
+// Only change the frame rects is the button rectangle is valid and the
+// button size has changed.
+if ( !rect.IsEmpty() && iExtension->iBgFrameRect != rect )
+{
+TAknLayoutRect centerLayout;
+centerLayout.LayoutRect( rect,
+AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() );
+TRect innerRect( centerLayout.Rect() );
+iBgContext->SetFrameRects( rect, innerRect );
+iExtension->iHighlightContext->SetFrameRects( rect, innerRect );
+iExtension->iBgFrameRect = rect;
+}
+}
+// -----------------------------------------------------------------------------
+// CAknButton::ConvertTextToVisualAndClip
+// -----------------------------------------------------------------------------
+//
+void CAknButton::ConvertTextToVisualAndClip( const TRect& aRect ) const
+{
+CAknButtonState* state = State();
+if ( !state || !state->HasText() )
+{
+if ( state )
+{
+state->ResetTextChanged();
+}
+return;
+}
+TRect textRect( aRect );
+//Using given rect to calculate the visual text if it's not empty.
+if ( !textRect.IsEmpty() )
+{
+iExtension->iTextRect = textRect;
+}
+//Calculate text area.
+//This branch means that it's the first calling after the state changed
+//or client using new font before this is shown.
+else
+{
+TRect iconRect;
+GetCurrentStateTextAndIconRect( iconRect, textRect );
+iExtension->iTextRect = textRect;
+}
+TInt clipWidth = textRect.Width();
+const CFont* font = iFont;
+if ( !font )
+{
+font = iCoeEnv->NormalFont();
+}
+// bidi processing - using AknBidiTextUtils.
+AknBidiTextUtils::ConvertToVisualAndClip(
+state->Text(),
+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.
 // -----------------------------------------------------------------------------
 //
 !Layout_Meta_Data::IsLandscapeOrientation() ).LayoutLine() );
 touchRect = layoutRect.Rect();
 }
 return touchRect;
 }
+// -----------------------------------------------------------------------------
+// CAknButton::EnableFeedback
+// Enables or disables tactile feedback
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void CAknButton::EnableFeedback( TBool aEnable )
+{
+if ( iExtension->iFeedbackEnabled == aEnable )
+{
+return;
+}
+iExtension->iFeedbackEnabled = aEnable;
+if ( aEnable )
+{
+if ( !iExtension->iFeedback )
+{
+iExtension->iFeedback = MTouchFeedback::Instance();
+}
+if ( !iExtension->iFeedback )
+{
+return;
+}
+if ( IsVisible() )
+{
+iExtension->iFeedback->MoveFeedbackAreaToFirstPriority( this,
+0 );
+iExtension->iFeedback->EnableFeedbackForControl(
+this,
+!IsDimmed() );
+}
+iExtension->HandleFeedbackAreaChange();
+}
+else
+{
+// MTouchFeedback instance lives in AknAppUi. If there is no
+// MTouchFeedback instance there is no need to remove any areas
+// either.
+MTouchFeedback* fb = MTouchFeedback::Instance();
+if ( fb )
+{
+fb->RemoveFeedbackForControl( this );
+}
+}
+}
 // end of file

branch	RCL_3
changeset 56	d48ab3b357f1
parent 55	aecbbf00d063
child 59	978afdc0236f