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

equal deleted inserted replaced

-:9f56a4e1b8ab
+:08e69e956a8c
 #include "akntree.h"
 #include "akntreelist.h"
 #include "akntreeiterator.h"
 #include "akntreelistphysicshandler.h"
+#include "akntrace.h"
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 #include <aknlistboxtfxinternal.h> // LISTBOX EFFECTS IMPLEMENTATION
 #include <aknlistloadertfx.h>
 if ( aDrawNow )
 {
 Window().Invalidate( Rect() );
 }
-UpdateScrollbars();
+UpdateScrollbars( ETrue );
 }
 // ---------------------------------------------------------------------------
 // Sets the focused item and its position in the view.
 UpdateAnimation();
 // Draw always
 Window().Invalidate( Rect() );
-UpdateScrollbars();
+UpdateScrollbars( ETrue );
 }
 // ---------------------------------------------------------------------------
 void CAknTreeListView::SetEmptyTextL(const TDesC& aText)
 {
 delete iEmptyListText;
 iEmptyListText = NULL;
 iEmptyListText = aText.AllocL();
-UpdateScrollbars();
+UpdateScrollbars( ETrue );
 }
 // ---------------------------------------------------------------------------
 // InitPhysicsL
 void CAknTreeListView::UpdateTreeListView( const TInt& aFirstItem,
 const TBool& aDrawNow )
 {
 CAknTreeItem* first = iTree.VisibleItem( aFirstItem );
 UpdateVisibleItems( 0, first );
-UpdateScrollbars();
+UpdateScrollbars( ETrue );
 UpdateAnimation();
 if ( aDrawNow )
 {
 DrawNow();
 // ---------------------------------------------------------------------------
 //
 void CAknTreeListView::MakeVisible( TBool aVisible )
 {
 CAknControl::MakeVisible( aVisible );
+UpdateScrollbars( aVisible );
-if ( aVisible )
-{
-UpdateScrollbars();
-}
 }
 // ---------------------------------------------------------------------------
 // From class CCoeControl.
 Window().SetPointerGrab( ETrue );
 iScrollbarFrame = new ( ELeave ) CEikScrollBarFrame( this, this );
 iScrollbarFrame->CreateDoubleSpanScrollBarsL( EFalse, EFalse );
+if ( CAknEnv::Static()->TransparencyEnabled() && iPhysicsHandler )
+{
+// disable background drawing of scrollbar
+iScrollbarFrame->DrawBackground( EFalse, EFalse );
+}
 }
 // ---------------------------------------------------------------------------
 // From class CCoeControl.
 // ---------------------------------------------------------------------------
 //
 void CAknTreeListView::HandleResourceChange( TInt aType )
 {
 CAknControl::HandleResourceChange( aType );
-if ( aType == KAknsMessageSkinChange )
-{
+switch ( aType )
-TRAPD( error, CreateAnimationL() )
+{
-if ( error )
+case KAknsMessageSkinChange:
 {
-delete iAnimation;
+TRAPD( error, CreateAnimationL() )
-iAnimation = NULL;
+if ( error )
-}
+{
-}
+delete iAnimation;
-else if ( aType == KEikDynamicLayoutVariantSwitch && FocusedItem() )
+iAnimation = NULL;
-{
+}
-if ( !FocusedItemVisible() )
+break;
-{
+}
-TInt firstItemIndex = 0;
-if ( iItems.Count() && iItems[0].Item() )
+case KEikDynamicLayoutVariantSwitch:
 {
-firstItemIndex = iTree.VisibleItemIndex( iItems[0].Item() );
+iMirroredLayoutInUse = AknLayoutUtils::LayoutMirrored();
-}
+CAknTreeItem* focusedItem( FocusedItem() );
-TInt index = 0;
+if ( focusedItem )
-if ( firstItemIndex < iTree.VisibleItemIndex( FocusedItem() ) )
+{
-{
+if ( !FocusedItemVisible() )
-index = iItems.Count() - 1;
+{
-}
+TInt firstItemIndex = 0;
+if ( iItems.Count() && iItems[0].Item() )
-SetFocusedItem( FocusedItem(), index, ETrue );
+{
-}
+firstItemIndex =
-else
+iTree.VisibleItemIndex( iItems[0].Item() );
-{
+}
-SetFocusedItem( FocusedItem(), FocusIndex(), ETrue );
+TInt index = 0;
+if ( firstItemIndex < iTree.VisibleItemIndex( focusedItem ) )
+{
+index = iItems.Count() - 1;
+}
+SetFocusedItem( focusedItem, index, ETrue );
+}
+else
+{
+SetFocusedItem( focusedItem, FocusIndex(), ETrue );
+// This block moves visible view after layout switch
+// if there are not enough items to fill whole screen
+TInt visibleItemIndex =
+iTree.VisibleItemIndex( focusedItem );
+if ( visibleItemIndex != KErrNotFound )
+{
+TInt focusedItemIndex = FocusedItemIndex();
+if ( focusedItemIndex != -1 )
+{
+TInt visibleItemCount( iTree.VisibleItemCount() );
+TInt height =
+visibleItemCount - visibleItemIndex + focusedItemIndex;
+TInt itemCountLimit = iItems.Count();
+if ( height < itemCountLimit &&
+height < visibleItemCount )
+{
+TInt move = itemCountLimit - height;
+UpdateVisibleItems(
+focusedItemIndex + move, focusedItem );
+}
+}
+}
+// end of block
+}
+}
+break;
+}
+case KAknMessageFocusLost:
+{
+if ( HighlightEnabled() )
+{
+EnableHighlight( EFalse );
+}
+break;
+}
-// This block moves visible view after layout switch
+default:
-// if there are not enough items to fill whole screen
+{
-TInt visibleItemIndex = iTree.VisibleItemIndex( FocusedItem() );
+break;
-if ( visibleItemIndex != KErrNotFound)
+}
-{
-TInt focusedItemIndex = FocusedItemIndex();
-if (focusedItemIndex != -1)
-{
-TInt height =  iTree.VisibleItemCount() - visibleItemIndex + focusedItemIndex;
-TInt itemCountLimit = iItems.Count();
-if ( height < itemCountLimit && height < iTree.VisibleItemCount() )
-{
-TInt move = itemCountLimit - height;
-UpdateVisibleItems( focusedItemIndex + move, FocusedItem() );
-}
-}
-}
-// end of block
-}
-}
-else if ( aType == KAknMessageFocusLost && HighlightEnabled() )
-{
-EnableHighlight( EFalse );
 }
 }
 // ---------------------------------------------------------------------------
 && aPointerEvent.iType == TPointerEvent::EButton1Up )
 {
 return;
 }
-if ( GrabbingComponent() != NULL )
+if ( GrabbingComponent() )
 {
 iPhysicsHandler->ResetEventBlockingStatus();
 }
 else
 {
 {
 EnableHighlight( EFalse );
 }
 TInt thumbPosition = aScrollBar->ThumbPosition();
-if ( AknLayoutUtils::LayoutMirrored() &&
+if ( iMirroredLayoutInUse &&
 aScrollBar != iScrollbarFrame->VerticalScrollBar() )
 {
 const TEikScrollBarModel* model = aScrollBar->Model();
 thumbPosition = ( model->iScrollSpan - model->iThumbSpan )
 - thumbPosition;
 case EEikScrollLeft:
 case EEikScrollRight:
 case EEikScrollPageLeft:
 case EEikScrollPageRight:
 iViewLevel = thumbPosition;
-UpdateScrollbars();
+UpdateScrollbars( ETrue );
 UpdateAnimation();
 Window().Invalidate( Rect() );
 break;
 case EEikScrollThumbDragHoriz:
 UpdateAnimation();
 Window().Invalidate( Rect() );
 break;
 case EEikScrollThumbReleaseHoriz:
-UpdateScrollbars();
+UpdateScrollbars( ETrue );
 break;
 case EEikScrollHome:
-// Not in use!
+// Not in use
 break;
 case EEikScrollEnd:
-// Not in use!
+// Not in use
 break;
 default:
 break;
 }
 break;
 }
 if ( aDrawNow )
 {
-		// it should be DrawNow() here for fixing bug JLAI-7UE9RN
+		// DrawNow must be used here.
 DrawNow();
-//Window().Invalidate( Rect() );
 }
 }
 // ---------------------------------------------------------------------------
 {
 Window().Invalidate( Rect() );
 }
 else if ( IsFocused() && FocusedItemVisible() )
 {
-TRect rect = iItems[FocusIndex()].HighlightRect( iViewLevel, Indention(), IndentionWidth() );
+TRect rect = iItems[FocusIndex()].HighlightRect( iViewLevel,
+Indention(),
+IndentionWidth() );
 Window().Invalidate( rect );
 }
 ReportTreeListEvent( MAknTreeListObserver::EItemFocused,
 iTree.Id( FocusedItem() ) );
 {
 // Get layout for the view.
 LayoutView();
 // Update scrollbars.
-UpdateScrollbars();
+UpdateScrollbars( ETrue );
 UpdateIndexes();
 AknsUtils::RegisterControlPosition( this, PositionRelativeToScreen() );
 TRAP_IGNORE( InitPhysicsL() );
 }
 else
 {
 EnableHighlight( ETrue );
 }
+iMirroredLayoutInUse = AknLayoutUtils::LayoutMirrored();
 }
 // ---------------------------------------------------------------------------
 // Handles an addition of new item into tree list. The focused item is kept
 // ---------------------------------------------------------------------------
 //
 void CAknTreeListView::HandleItemAddedEvent( CAknTreeItem* /*aItem*/, TBool aDrawNow )
 {
 UpdateVisibleItems();
-if (aDrawNow)
+UpdateScrollbars( aDrawNow );
-{
-UpdateScrollbars();
-}
 }
 // ---------------------------------------------------------------------------
 // Handles the movement of a tree item. Movement of focused item has to be
 {
 // Note: This method cannot deduce, which items in the view have actually
 // been changed, unless the it receives information from where the
 // specified item was moved.
 UpdateVisibleItems();
-UpdateScrollbars();
+UpdateScrollbars( ETrue );
 }
 // ---------------------------------------------------------------------------
 // Prepares view for the item removal by moving the focus from the removed
 // ---------------------------------------------------------------------------
 //
 void CAknTreeListView::HandleItemRemovedEvent( CAknTreeItem* /*aItem*/, TBool aDrawNow )
 {
 UpdateVisibleItems();
-if (aDrawNow)
+UpdateScrollbars( aDrawNow );
-{
-UpdateScrollbars();
-}
 }
 // ---------------------------------------------------------------------------
 // Handles an expansion of a tree node. If the expanded node is focused, it is
 }
 else
 {
 UpdateVisibleItems();
 }
-UpdateScrollbars();
+UpdateScrollbars( ETrue );
 }
 // ---------------------------------------------------------------------------
 // Handles a collapse of a tree node. If one of the items in collapsed node
 // visible
 UpdateViewItemAsVisible( aNode );
 }
 UpdateVisibleItems();
-UpdateScrollbars();
+UpdateScrollbars( ETrue );
 }
 // ---------------------------------------------------------------------------
 // Handles a change in tree item.
 {
 iItems[ii].SetItem( iterator.Next() );
 }
 }
 }
-if ( aDrawNow )
-{
+UpdateScrollbars( aDrawNow );
-UpdateScrollbars();
-}
 }
 // ---------------------------------------------------------------------------
 // Updates the view items so that the specified item is located at the
 // Handles right arrow key event.
 // ---------------------------------------------------------------------------
 //
 void CAknTreeListView::HandleRightArrowKeyEvent()
 {
-if ( AknLayoutUtils::LayoutMirrored() )
+if ( iMirroredLayoutInUse )
 {
 AscendFocus();
 }
 else
 {
 // Handles left arrow key event.
 // ---------------------------------------------------------------------------
 //
 void CAknTreeListView::HandleLeftArrowKeyEvent()
 {
-if ( AknLayoutUtils::LayoutMirrored() )
+if ( iMirroredLayoutInUse )
 {
 DescendFocus();
 }
 else
 {
 TRect viewRect( listRect );
 // Fill whole control area with list items when physics enabled
 // and threre is no horizontal scrollbar.
 if ( iScrollbarFrame &&
-iScrollbarFrame->ScrollBarVisibility( CEikScrollBar::EHorizontal ) != CEikScrollBarFrame::EOn &&
+iScrollbarFrame->ScrollBarVisibility(
+CEikScrollBar::EHorizontal ) != CEikScrollBarFrame::EOn &&
 viewRect.Height() < Rect().Height() )
 {
 viewRect.iTl.iY = Rect().iTl.iY;
 viewRect.iBr.iY = Rect().iBr.iY;
 }
 // Updates the span, thumb size and position for both of the scrollbars. New
 // layout for the view is applied, if the visibility of either of the
 // scrollbars changes.
 // ---------------------------------------------------------------------------
 //
-void CAknTreeListView::UpdateScrollbars()
+void CAknTreeListView::UpdateScrollbars( TBool aDrawNow )
 {
 if ( iScrollbarFrame )
 {
+TBool drawHorizontal;
+TBool drawVertical;
+if ( !aDrawNow )
+{
+// Backup the old values.
+iScrollbarFrame->DrawBackgroundState( drawHorizontal,
+drawVertical );
+// Disable the scrollbar background drawing for the duration
+// of this call.
+iScrollbarFrame->DrawBackground( EFalse, EFalse );
+}
 iPhysicsHandler->UpdateScrollIndex( iScrollPhysicsTop );
 iScrollPhysicsTop = ETrue;
 // Get values for horizontal scrollbar.
 TInt hThumbPos = iViewLevel;
 IndentionWidth() ).Width();
 hThumbSpan = a/b;
 hScrollSpan = Max( hThumbPos + hThumbSpan, c/b );
 }
-if ( AknLayoutUtils::LayoutMirrored() )
+if ( iMirroredLayoutInUse )
 {
 hThumbPos = hScrollSpan - ( hThumbPos + hThumbSpan );
 }
 TEikScrollBarModel hModel( hScrollSpan, hThumbSpan, hThumbPos );
 // Set new model for scrollbars.
 iScrollbarFrame->Tile( &hModel, &vModel );
 LayoutView();
-UpdateScrollbars(); // Recursion
+UpdateScrollbars( aDrawNow ); // Recursion
 // Update animation in case that scrollbar visibility change
 // has affected the highlight size of focused item.
 UpdateAnimation();
 }
 else
 {
 // Set new model for scrollbars.
 iScrollbarFrame->Tile( &hModel, &vModel );
 }
+if ( !aDrawNow )
+{
+// Restore the previous draw background state values.
+iScrollbarFrame->DrawBackground( drawHorizontal, drawVertical );
+}
 }
 }
 {
 TRect drawRect( iItems[ii].Rect() );
 if ( iItems[ii].Item() )
 {
+if ( !aRect.Intersects(drawRect) )
+{
+//invisible item yet
+continue;
+}
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 TRect tfxDrawRect( drawRect );
 tfxDrawRect.Move( 0, -offset );
 if ( transApi )
 {
 transApi->StartDrawing( MAknListBoxTfxInternal::EListNotSpecified );
 }
 TRect clippingRect( tfxDrawRect );
 // If horizontal scrollbar on, reduce clipping rect
 // based on view rect from layout data
 if ( iScrollbarFrame->ScrollBarVisibility( CEikScrollBar::EHorizontal )
 }
 // Set clipping rect.
 gc.SetClippingRect( clippingRect );
 if ( transApi )
 {
 transApi->StopDrawing();
 }
 #endif
 if ( ii < iBottomIndex )
 {
-AknListUtils::DrawSeparator( gc, drawRect, textColor, skin );
+TRect offsetRect( drawRect );
+offsetRect.Move( 0, -offset );
+AknListUtils::DrawSeparator( gc, offsetRect, textColor, skin );
 }
 TBool focused = ( IsFocused() && FocusedItem() &&
 iItems[ii].Item() == FocusedItem() );
 {
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 if ( transApi )
 {
 transApi->Invalidate(MAknListBoxTfxInternal::EListHighlight );
-transApi->BeginRedraw( MAknListBoxTfxInternal::EListHighlight, tfxHighlightRect );
+transApi->BeginRedraw( MAknListBoxTfxInternal::EListHighlight,
+tfxHighlightRect );
 transApi->StartDrawing( MAknListBoxTfxInternal::EListHighlight );
 }
 #endif //RD_UI_TRANSITION_EFFECTS_LIST
 DrawHighlight( gc, highlightRect, iIsPressedDownState );
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 if (iItems[ii].Item())
 {
 if ( transApi )
 {
-transApi->BeginRedraw(MAknListBoxTfxInternal::EListItem, tfxDrawRect, iTree.VisibleItemIndex(iItems[ii].Item()));
+transApi->BeginRedraw(
+MAknListBoxTfxInternal::EListItem,
+tfxDrawRect,
+iTree.VisibleItemIndex( iItems[ii].Item() ) );
 transApi->StartDrawing( MAknListBoxTfxInternal::EListItem );
 }
 #endif //RD_UI_TRANSITION_EFFECTS_LIST
 // Draw item.
 #ifdef RD_UI_TRANSITION_EFFECTS_LIST
 if ( transApi )
 {
 transApi->StopDrawing();
-transApi->EndRedraw(MAknListBoxTfxInternal::EListItem, iTree.VisibleItemIndex(iItems[ii].Item()));
+transApi->EndRedraw(
+MAknListBoxTfxInternal::EListItem,
+iTree.VisibleItemIndex( iItems[ii].Item() ) );
 }
 }
 #endif //RD_UI_TRANSITION_EFFECTS_LIST
 }

branch	RCL_3
changeset 15	08e69e956a8c
parent 10	9f56a4e1b8ab
child 16	71dd06cfe933