FCL/sf/mw/classicui: comparison uifw/EikStd/coctlsrc/AknToolbar.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".
 {
 aReader.ReadInt8(); //version, not used currently
 aReader.ReadInt8();  //lines, not used currently
 iFlags = aReader.ReadInt32();
-TBool enableTransparency = CAknEnv::Static()->TransparencyEnabled() &&
+TBool enableTransparency =
 ( ( !( iFlags & KAknToolbarFixed ) &&
 !( iFlags & KAknToolbarFloatingUnTransparent ) ) ||
 ( iFlags & KAknToolbarTransparent && iFlags & KAknToolbarFixed ) );
+if ( enableTransparency )
-if( enableTransparency )
 {
 Window().SetRequiredDisplayMode( EColor16MA ); // Without this, ACT does not work in all cases in HW
-TInt err = Window().SetTransparencyAlphaChannel();
+EnableWindowTransparency();
+}
-if ( err == KErrNone ) // it should all ways be true in NGA
-{
+TRect dummyRect( 0, 0, 0, 0 );
-// Set the window initially completely transparent. This needs to be called only once.
+iFrameContext = CAknsFrameBackgroundControlContext::NewL(
-Window().SetBackgroundColor(~0);
+KAknsIIDQsnFrPopupSub,
-}
+dummyRect,
-}
+dummyRect,
+( iFlags & KAknToolbarFixed ) ? ETrue : EFalse );
-iFrameContext = CAknsFrameBackgroundControlContext::NewL( KAknsIIDQsnFrPopupSub,
-TRect(), TRect(), ( iFlags & KAknToolbarFixed )? ETrue : EFalse );
 iBgContext = CAknsBasicBackgroundControlContext::NewL(
-KAknsIIDQsnBgScreen, TRect(), ETrue );
+KAknsIIDQsnBgScreen, dummyRect, ETrue );
 SetWithSliding( ETrue );
 TInt softkeyResource = aReader.ReadUint32(); //softkeys
 // If toolbar is fixed need to set size for toolbar so that it can reduce
 // the rects correctly.
 if ( iFlags & KAknToolbarFixed )
 {
-if ( iFlags & KAknToolbarDefault )
+SetFocusing( EFalse );
-{
-SetDimmed( ETrue );
+// Don't set the size and position for default toolbar (never shown).
-}
+if ( !( iFlags & KAknToolbarDefault ) )
-SetFocusing( EFalse );
+{
 SetRect( CalculateSizeAndPosition() );
 }
+}
-AdjustAllButtons();
+// Unnecessary for default toolbar (never shown).
+if ( !( iFlags & KAknToolbarDefault ) )
+{
+AdjustAllButtons();
+}
 }
 // -----------------------------------------------------------------------------
 // CAknToolbar::ConstructFromResourceL
 // Constructs controls from a resource file.
 else
 {
 iInternalFlags.Clear( EFixedShown );
 }
-if ( visible && ( !AknLayoutUtils::PenEnabled() ||
+if ( visible &&
-( !Layout_Meta_Data::IsLandscapeOrientation() && iFlags & KAknToolbarDefault ) ) )
+!Layout_Meta_Data::IsLandscapeOrientation() &&
+iFlags & KAknToolbarDefault )
 {
 return;
 }
 }
 // The position of the top left corner should be set in advance.
 // -----------------------------------------------------------------------------
 //
 void CAknToolbar::ShowToolbarL()
 {
-if ( iFlags & KAknToolbarFixed &&
+if ( iFlags & KAknToolbarFixed && iFlags & KAknToolbarDefault )
-( !AknLayoutUtils::PenEnabled() ||
-iFlags & KAknToolbarDefault ) )
 {
 if ( IsVisible() )
 {
 MakeVisible( EFalse );
 }
 startPos.iX = -rect.Size().iWidth;
 }
 SetExtent( startPos, rect.Size() );
 UpdateControlPositions();
-TBool redrawStoreEnabled(EFalse);
-if( !CAknEnv::Static()->TransparencyEnabled() )
-{
-redrawStoreEnabled = Window().IsRedrawStoreEnabled();
-}
 CTouchToolbarData* data = CheckRegistration( this );
 if ( data && !(iFlags & KAknToolbarFixed) && iAvkonAppUi->IsForeground() )
 {
 data->SetBetweenRegisterAndBegin( EFalse );
 else
 {
 CAknTransitionUtils::RemoveData( reinterpret_cast<TInt>( this ) );
 delete data;
 GfxTransEffect::Deregister( this );
-}
-if ( !CAknEnv::Static()->TransparencyEnabled() && redrawStoreEnabled )
-{
-Window().EnableRedrawStore( ETrue );
 }
 }
 // notify observer, for example touch pane, that toolbar was shown
 if ( Observer() )
 //
 void CAknToolbar::HideToolbarL()
 {
 if ( !iInternalFlags.IsSet( EShown ) ) // nothing to hide
 {
-if ( iFlags & KAknToolbarDefault && !AknLayoutUtils::PenEnabled()
-&& IsVisible() )
-{
-MakeVisible( EFalse );
-}
 return;
 }
 if ( iIdle && iIdle->IsActive() )
 {
 //
 EXPORT_C void CAknToolbar::SetItemDimmed( const TInt aCommandId,
 const TBool aDimmed,
 const TBool aDrawNow )
 {
+if( IsDimmed() )
+	return;
 CAknToolbarItem* item = ToolbarItemById( aCommandId );
 if ( item && item->Control() )
 {
 item->Control()->SetDimmed( aDimmed );
 if ( aDimmed && IsFocused() && item->Control()->IsFocused() )
 if ( ii != iDownItem && !button->IsDimmed() )
 {
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if ( feedback )
 {
-feedback->InstantFeedback( ETouchFeedbackBasicButton );
+feedback->InstantFeedback( button,
+ETouchFeedbackBasicButton,
+ETouchFeedbackVibra,
+aPointerEvent );
 }
 }
 button->HandlePointerEventL( aPointerEvent );
 override = ETrue;
 iInternalFlags.Clear( EFixedShown );
 }
 return;
 }
 }
-if ( aType == KAknToolbarSetVisible && iFlags & KAknToolbarDefault
+if ( aType == KAknToolbarSetVisible && !IsShown() )
-&& !AknLayoutUtils::PenEnabled() )
-{
-return;
-}
-else if ( aType == KAknToolbarSetVisible && !IsShown() )
 {
 iInternalFlags.Set( ECalledFromFW );
 iInternalFlags.Clear( EDrawBackground );
 SetToolbarVisibility(ETrue, EFalse);
 iInternalFlags.Clear( ECalledFromFW );
 {
 iPreviousItem = KSelectedNone;
 for(TInt i = 0; i < iVisibleItems.Count(); i++)
 {
 CAknToolbarItem* item = iVisibleItems[ i ];
-CAknButton* button = static_cast<CAknButton*>( item->Control() );
+if( item->ControlType() == EAknCtButton
-button->ResetState();
+|| item->ControlType() == EAknCtToolbarExtension )
-}
+{
-if ( iFlags & KAknToolbarDefault && !AknLayoutUtils::PenEnabled() && IsVisible() )
+CAknButton* button = static_cast<CAknButton*>( item->Control() );
-{
+button->ResetState();
-TRAP_IGNORE( HideToolbarL() );
+}
-return;
+}
-}
-else if ( iFlags & KAknToolbarFixed )
+if ( iFlags & KAknToolbarFixed )
 {
-if ( Layout_Meta_Data::IsLandscapeOrientation() && AknLayoutUtils::PenEnabled() )
+if ( Layout_Meta_Data::IsLandscapeOrientation() )
 {
 iOrientation = EAknOrientationVertical;
 if ( ( iInternalFlags.IsSet( EFixedShown )
 || ( iInternalFlags.IsSet( EItemsHidden )
 && iInternalFlags.IsSet( EAppOverrideVisibility ) ) )
 {
 ShowViaIdle();
 }
 }
 }
-else if ( !( iFlags & KAknToolbarDefault ) && AknLayoutUtils::PenEnabled() )
+else if ( !( iFlags & KAknToolbarDefault ) )
 {
 iOrientation = EAknOrientationHorizontal;
 if ( iInternalFlags.IsSet( EFixedShown ) && !iInternalFlags.IsSet( EShown ) )
 {
 // If showing toolbar because HideItemsAndDrawOnlyBackground( EFalse )
 {
 ShowViaIdle();
 }
 }
 }
-else if ( ( !AknLayoutUtils::PenEnabled() || iFlags & KAknToolbarDefault ) && iInternalFlags.IsSet( EShown ) )
+else if ( iFlags & KAknToolbarDefault && iInternalFlags.IsSet( EShown ) )
 {
 TRAP_IGNORE( HideToolbarL() );
 return;
 }
 else
 SetOrdinalPositions();
 }
 CWindowGc& gc = SystemGc();
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-// Draw background
-if ( iFlags & KAknToolbarFixed &&
+//
+// Draw background
+//
+if ( iFlags & KAknToolbarFixed && !( iFlags & KAknToolbarNoBackground ) &&
 iBgRect.Height() > 0 &&
 iBgRect.Width() > 0 )
 {
 if ( aRect.Intersects( iBgRect ) )
 {
 {
 iFrameContext->SetCenter( KAknsIIDQgnGrafPopupTransCenter );
 }
 }
-TRect rect = CalculateSizeAndPosition();
+// Don't set the size and position for default toolbar (never shown).
-// Set focused item again to avoid panic in a case when toolbar has more
+if ( !( iFlags & KAknToolbarDefault ) )
-// items in previous orientation and some of the items that do not
+{
-// fit to toolbar in this orientation was focused.
+TRect rect = CalculateSizeAndPosition();
-if ( IsFocused() )
+// Set focused item again to avoid panic in a case when toolbar has
-{
+// more items in previous orientation and some of the items that do
-TRAP_IGNORE( MoveHighlightL( iFocusedItem, EFalse ) );
+// not  fit to toolbar in this orientation was focused.
-}
+if ( IsFocused() )
+{
-if ( iInternalFlags.IsSet( EShown ) )
+TRAP_IGNORE( MoveHighlightL( iFocusedItem, EFalse ) );
-{
+}
-if ( !( iFlags & KAknToolbarFlexiblePosition ) )
-{
+if ( iInternalFlags.IsSet( EShown ) )
-SetPosition( rect.iTl );
+{
-}
+if ( !( iFlags & KAknToolbarFlexiblePosition ) )
-else
+{
-{
+SetPosition( rect.iTl );
-UpdateControlPositions();
+}
-}
+else
-SetSize( rect.Size() );
+{
-DrawDeferred();
+UpdateControlPositions();
+}
+SetSize( rect.Size() );
+DrawDeferred();
+}
 }
 }
 // -----------------------------------------------------------------------------
 // CAknToolbar::NotifyBackgroundChange
 //
 void CAknToolbar::ReduceRect( TRect& aBoundingRect ) const
 {
 TBool toolbarNotVisible( !IsShown() && !( iFlags & KAknToolbarDefault ) );
 TBool fixedToolbar( iFlags & KAknToolbarFixed );
-TBool landscapeOrientation( Layout_Meta_Data::IsLandscapeOrientation() );
-TBool touchEnabled( AknLayoutUtils::PenEnabled() );
 TBool defaultContent( iFlags & KAknToolbarDefault );
 if ( toolbarNotVisible ||
 !fixedToolbar ||
-( defaultContent && !landscapeOrientation ) ||
-!touchEnabled ||
 ( fixedToolbar && defaultContent ) )
 {
 return;
 }
 TRect appRect, toolbarRect;
 aCellPaneRect = RectFromLayout( aGridPaneRect,
 AknLayoutScalable_Avkon::cell_sctrl_middle_pane( 0, 0, 0 ) );
 }
 }
 else
 {
 if ( iOrientation == EAknOrientationHorizontal )
 {
 variety = 4;
 aToolbarRect = RectFromLayout( aMainPaneRect,
 AknLayoutScalable_Avkon::popup_toolbar_window( variety ) );
 aGridPaneRect = RectFromLayout( TRect( TPoint(), aToolbarRect.Size() ),
 AknLayoutScalable_Avkon::grid_toobar_pane() );

branch	RCL_3
changeset 56	d48ab3b357f1
parent 55	aecbbf00d063