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

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 /*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2009 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".
 #include <AknsConstants.h>
 #include <eikapp.h>
 #include <aknappui.h>
 #include <AknDef.h>
 #include <touchfeedback.h>
-#include <layoutmetadata.cdl.h>
 #include "aknstyluspopupmenuphysicshandler.h"
 #include "aknstyluspopupmenucontent.h"
 const TInt KItemArrayGranularity = 4;
 aCommandId );
 CleanupStack::PushL( item );
 item->ConstructL( aItem );
 iItems.AppendL( item );
 CleanupStack::Pop( item );
 }
 // ---------------------------------------------------------------------------
 // Removes the menu item based on the given command id and frees the
 // memory occupied by it.
 iFirstItem = i;
 break;
 }
 }
 }
-//SizeChanged();
+SizeChanged();
 }
 }
 // ---------------------------------------------------------------------------
 // Returns the command id of the specified menu item.
 TInt height = 0; // height of all menu items combined.
 TInt width = 0; // Width of menu
 TInt visibleItems = 0; // Number of visible items
 // Find the widest visible item and count visible items
-TRect screenRect;
-AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen,
-screenRect );
-TInt screenHeight( screenRect.Height() );
-TInt screenWidth( screenRect.Width() );
-const CFont* usedFont = AknLayoutUtils::FontFromId(
-AknLayoutScalable_Avkon::list_single_popup_submenu_pane_t1( 0 ).Font() );
 for ( TInt i = 0; i < iItems.Count(); i++ )
 {
 if ( iItems[i]->iVisibility == KShown )
 {
 visibleItems++;
-textWidth = usedFont->TextWidthInPixels( *( iItems[i]->iText ) );
+textWidth = AknLayoutUtils::FontFromId( AknLayoutScalable_Avkon::
+list_single_popup_submenu_pane_t1( 0 ).LayoutLine().FontId() )->TextWidthInPixels( *( iItems[i]->iText ) );
 width = Max( width, textWidth );
 }
 }
 if ( visibleItems == 0 )
 {
 return TSize( 0, 0 );
 }
-// Check the minimum width from the layout data and adjust the width
+TRect mainPaneRect;
-// if the text would take less space than that.
+AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane,
-TInt minWidth =
+mainPaneRect );
-TAknWindowComponentLayout::Compose(
-AknLayoutScalable_Avkon::popup_touch_menu_window( 0 ),
-TAknWindowComponentLayout::Compose(
-AknLayoutScalable_Avkon::list_touch_menu_pane( 0 ),
-AknLayoutScalable_Avkon::list_single_touch_menu_pane( 0 ) ) ).LayoutLine().iW;
-width = Max( width, minWidth );
 TAknWindowLineLayout listLayout =
 AknLayoutScalable_Avkon::list_single_touch_menu_pane(0).LayoutLine();
 TAknTextLineLayout textLayout =
 AknLayoutScalable_Avkon::list_single_touch_menu_pane_t1().LayoutLine();
 AknLayoutScalable_Avkon::aid_value_unit2().LayoutLine();
 TInt singleItemHeight = listLayout.iH;
 height = singleItemHeight * visibleItems;
-if ( height > screenHeight )
+if ( height > mainPaneRect.Height() )
 {
-// Amount of items that fit in the popup.
+TInt fitsToMenu = mainPaneRect.Height() / singleItemHeight;
-TInt fitsToMenu = visibleItems;
-if ( Layout_Meta_Data::IsLandscapeOrientation() )
-{
-// In landscape orientation the max amount of items comes from
-// the layout data.
-TAknLayoutScalableParameterLimits paramLimits(
-AknLayoutScalable_Avkon::list_single_touch_menu_pane_ParamLimits() );
-// Add one to the last row as it's row index starting from zero.
-fitsToMenu = paramLimits.LastRow() + 1;
-}
-else
-{
-// In potrait orientation the menu can show as many items as fit
-// on the screen.
-fitsToMenu = screenHeight / singleItemHeight;
-}
 height = fitsToMenu * singleItemHeight;
 TAknWindowLineLayout scrollBar =
 AknLayoutScalable_Avkon::scroll_pane( 0 );
 width += scrollBar.iW;
 }
 width += textLayout.ir + textLayout.il;
-if ( width > ( screenWidth - unit.iW ) )
+if ( width > ( mainPaneRect.Width() - unit.iW ) )
 {
-width = screenWidth - ( unit.iW );
+width = mainPaneRect.Width() - ( unit.iW );
 }
 return TSize( width, height );
 }
 if ( aType == KAknsMessageSkinChange )
 {
 // Implementation when graphics are ready.
 }
-else if ( aType == KEikMessageFadeAllWindows )
+else if ( aType == KEikDynamicLayoutVariantSwitch )
+{
+// Background under highlight may have changed -> we need to update
+// highlight background to animation
+if ( iExtension )
+{
+iExtension->HandleLayoutSwitch();
+}
+iPopUpMenu.UpdatePosition();
+}
+else if ( aType == KEikMessageFadeAllWindows )
 {
 if ( Observer() )
 {
-if ( iExtension )
-{
-iExtension->iInformObserver = EFalse;
-}
 // this will close the stylus popup menu
 TRAP_IGNORE( Observer()->HandleControlEventL( this,
 MCoeControlObserver::EEventRequestExit ) );
 }
 }
-else if ( aType == KEikDynamicLayoutVariantSwitch )
-{
-if ( Observer() )
-{
-if ( iExtension )
-{
-iExtension->iInformObserver = EFalse;
-}
-// this will close the stylus popup menu
-TRAP_IGNORE( Observer()->HandleControlEventL( this,
-MCoeControlObserver::EEventRequestCancel ) );
-}
-}
 }
 // -----------------------------------------------------------------------------
 // CAknStylusPopUpMenuContent::HandlePointerEventL
 // -----------------------------------------------------------------------------
 else
 {
 if ( iExtension && iExtension->iInformObserver && !iExtension->iObserverInformed )
 {
 iExtension->iInformObserver = EFalse;
-if ( Observer() )
+TRAP_IGNORE(Observer()->HandleControlEventL( this,
-{
+MCoeControlObserver::EEventRequestCancel ));
-TRAP_IGNORE(Observer()->HandleControlEventL( this,
-MCoeControlObserver::EEventRequestCancel ));
-}
 }
 if ( iSBFrame )
 {
 delete iSBFrame;
 iSBFrame = NULL;
 void CAknStylusPopUpMenuContent::DrawItem(
 CWindowGc& aGc,TInt aItem,THighlightType aHighlight) const
 {
 TRect rect( iItems[aItem]->iRect );
-if ( !rect.IsEmpty() )
+// Use offset to move items smoothly.
-{
+// If physics not in use, offset is always 0.
-// Use offset to move items smoothly.
+rect.Move( TPoint( 0, -Offset() ) );
-// If physics not in use, offset is always 0.
-rect.Move( TPoint( 0, -Offset() ) );
+if ( aHighlight == EDrawHighlight )
+{
-if ( aHighlight == EDrawHighlight )
+TBool drawOk = EFalse;
-{
+if( iExtension->iAnimation ) // Draw animated highlight
-TBool drawOk = EFalse;
+{
-if( iExtension->iAnimation ) // Draw animated highlight
+drawOk = iExtension->iAnimation->Render( aGc, rect );
+}
+if ( !drawOk )
+{
+// Animated highlight was not available, use normal skinned
+// rendering.
+TAknLayoutRect listRect;
+TAknLayoutRect innerRect;
+listRect.LayoutRect( rect,
+AknLayoutScalable_Avkon::list_highlight_pane_cp1().LayoutLine() );
+innerRect.LayoutRect( listRect.Rect(),
+AknLayoutScalable_Avkon::list_highlight_pane_g1_cp1().LayoutLine() );
+MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+aGc.SetBrushStyle( CGraphicsContext::ESolidBrush );
+// if we have transparent highlight, draw also background under highlight
+if ( Background() )
 {
-drawOk = iExtension->iAnimation->Render( aGc, rect );
+Background()->Draw( aGc, *this, rect );
 }
+drawOk = AknsDrawUtils::DrawFrame( skin, aGc, rect, innerRect.Rect(),
+KAknsIIDQsnFrList, KAknsIIDDefault );
+//Both highlight animation and frame drawing failed.
 if ( !drawOk )
 {
-// Animated highlight was not available, use normal skinned
+listRect.DrawRect( aGc );
-// rendering.
+innerRect.DrawRect( aGc );
-TAknLayoutRect listRect;
-TAknLayoutRect innerRect;
-listRect.LayoutRect( rect,
-AknLayoutScalable_Avkon::list_highlight_pane_cp1().LayoutLine() );
-innerRect.LayoutRect( listRect.Rect(),
-AknLayoutScalable_Avkon::list_highlight_pane_g1_cp1().LayoutLine() );
-MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-aGc.SetBrushStyle( CGraphicsContext::ESolidBrush );
-// if we have transparent highlight, draw also background under highlight
-if ( Background() )
-{
-Background()->Draw( aGc, *this, rect );
-}
-drawOk = AknsDrawUtils::DrawFrame( skin, aGc, rect, innerRect.Rect(),
-KAknsIIDQsnFrList, KAknsIIDDefault );
-//Both highlight animation and frame drawing failed.
-if ( !drawOk )
-{
-listRect.DrawRect( aGc );
-innerRect.DrawRect( aGc );
-}
 }
 }
+}
-if ( aHighlight == ERemoveHighlight && Background() )
-{
+if ( aHighlight == ERemoveHighlight && Background() )
-Background()->Draw( aGc, *this, rect );
+{
-}
+Background()->Draw( aGc, *this, rect );
+}
-TAknLayoutText layoutText;
-layoutText.LayoutText( rect,
+TAknLayoutText layoutText;
-AknLayoutScalable_Avkon::list_single_touch_menu_pane_t1().LayoutLine());
+layoutText.LayoutText( rect,
+AknLayoutScalable_Avkon::list_single_touch_menu_pane_t1().LayoutLine());
-MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-TRgb textColor(layoutText.Color());
-AknsUtils::GetCachedColor( skin, textColor, KAknsIIDQsnTextColors,
+TRgb textColor(layoutText.Color());
-EAknsCIQsnTextColorsCG20 );
+AknsUtils::GetCachedColor( skin, textColor, KAknsIIDQsnTextColors,
+EAknsCIQsnTextColorsCG20 );
-layoutText.DrawText( aGc, *(iItems[aItem]->iText), ETrue, textColor );
+layoutText.DrawText( aGc, *(iItems[aItem]->iText), ETrue, textColor );
-if ( aItem < iLastVisibleItem )
-{
-AknListUtils::DrawSeparator( aGc, rect, textColor, skin );
-}
-		}
 }
 // -----------------------------------------------------------------------------
 // CAknStylusPopUpMenuContent::StartAnimation
 // -----------------------------------------------------------------------------
 CEikScrollBarFrame::EOff ) );
 return;
 }
 TAknDoubleSpanScrollBarModel vsbarModel;
+TAknDoubleSpanScrollBarModel hsbarModel;
 if ( iSBFrame->VScrollBarVisibility() != CEikScrollBarFrame::EOff )
 {
 vsbarModel.iThumbPosition = thumbPos * singleItemHeight + Offset();
 vsbarModel.iScrollSpan = visibleItems * singleItemHeight;
 vsbarModel.iThumbSpan = fitsToMenu * singleItemHeight;
-TAknLayoutRect scrollBarLayout;
+TEikScrollBarFrameLayout layout;
-scrollBarLayout.LayoutRect( listRect,
+layout.iTilingMode=TEikScrollBarFrameLayout::EInclusiveRectConstant;
-AknLayoutScalable_Avkon::scroll_pane() );
+layout.SetClientMargin(0);
-TRect scrollBarRect( scrollBarLayout.Rect() );
+layout.SetInclusiveMargin(0);
-iSBFrame->Tile( &vsbarModel, scrollBarRect );
+TBool changed ( EFalse );
+TRect clientRect( listRect );
-iSBFrame->DrawScrollBarsDeferred();
+TRect inclusiveRect( listRect );
+TRAP_IGNORE ( changed = iSBFrame->TileL( &hsbarModel,
+&vsbarModel,
+clientRect,
+inclusiveRect,
+layout ) );
+if ( changed )
+{
+iSBFrame->DrawScrollBarsDeferred();
+}
 }
 }
 // -----------------------------------------------------------------------------
 // CAknStylusPopUpMenuContent::CalculateShownItems
 listRect.iBr.iX -= AknLayoutScalable_Avkon::scroll_pane().LayoutLine().iW;
 }
 }
 }
 }
-else
-	{
-if ( AknLayoutUtils::LayoutMirrored() )
-	            {
-listRect.iTl.iX += AknLayoutScalable_Avkon::scroll_pane().LayoutLine().iW;
-	            }
-else
-	            {
-listRect.iBr.iX -= AknLayoutScalable_Avkon::scroll_pane().LayoutLine().iW;
-}
-	}
 }
 // Adjust first and last item
 if ( iFirstItem < firstItem )
 itemRect.SetRect( TPoint( 0,0 ), TPoint( 0,0 ) );
 }
 iItems[i]->iRect = itemRect;
 }
-if ( lastItem == iItems.Count() || ( Rect().Height() % singleItemHeight ) == 0 )
+return lastItem;
-{
-// substract the partially visible item
---lastItem;
-}
-return lastItem;
 }
 // ---------------------------------------------------------------------------
 // From class CCoeControl
 // CAknStylusPopUpMenuContent::SizeChanged
 iPhysicsHandler->SetWorldHeight( WorldHeight() );
 iPhysicsHandler->SetViewRect( Rect() );
 TRAP_IGNORE( InitPhysicsL() );
-if ( ( iLastVisibleItem = CalculateShownItems( ENoScroll ) ) != KNoItemSelected )
+if ( CalculateShownItems( ENoScroll ) != KNoItemSelected )
 {
 UpdateScrollBar();
 DrawNow();
 }
 }
 {
 if ( AknLayoutUtils::PenEnabled() )
 {
 CWindowGc& gc = SystemGc();
-gc.SetClippingRect( Rect() );
 for ( TInt i=iFirstItem; i < iItems.Count(); i++ )
 {
 if ( iItems[i]->iVisibility != KHidden )
 {
 DrawItem( gc, i, ( i == iCurrentItem ) ? EDrawHighlight :
 ENoHighlight );
 }
 }
-gc.CancelClippingRect();
 }
 }
 // -----------------------------------------------------------------------------
 //
 void CAknStylusPopUpMenuContent::HandleLosingForeground()
 {
 if ( Observer() )
 {
-if ( iExtension )
-{
-iExtension->iInformObserver = EFalse;
-}
 // this will close the stylus popup menu
 TRAP_IGNORE( Observer()->HandleControlEventL( this,
 MCoeControlObserver::EEventRequestExit ) );
 }
 }
 if ( visibleItems == 0 )
 {
 return 0;
 }
+TRect mainPaneRect;
+AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane,
+mainPaneRect );
 TAknWindowLineLayout listLayout =
 AknLayoutScalable_Avkon::list_single_touch_menu_pane(0).LayoutLine();
+TAknTextLineLayout textLayout =
+AknLayoutScalable_Avkon::list_single_touch_menu_pane_t1().LayoutLine();
+TAknWindowLineLayout unit =
+AknLayoutScalable_Avkon::aid_value_unit2().LayoutLine();
 TInt singleItemHeight = listLayout.iH;
 TInt height = singleItemHeight * visibleItems;
 return height;
 }
 {
 return iCurrentItem;
 }
 // ---------------------------------------------------------------------------
-// CAknStylusPopUpMenuContent::SelectItemL
+// CAknStylusPopUpMenuContent::SelectItem
 // ---------------------------------------------------------------------------
 //
-void CAknStylusPopUpMenuContent::SelectItemL( TInt aItem )
+void CAknStylusPopUpMenuContent::SelectItem( TInt aItem )
 {
 iCurrentItem = aItem;
 if ( Observer() )
 {
 if ( iExtension )
 {
 iExtension->iInformObserver = EFalse;
 iExtension->iObserverInformed = ETrue;
 }
-Observer()->HandleControlEventL( this,
+TRAP_IGNORE(Observer()->HandleControlEventL( this,
-MCoeControlObserver::EEventStateChanged );
+MCoeControlObserver::EEventStateChanged ));
 }
 }

branch	RCL_3
changeset 55	aecbbf00d063
parent 10	9f56a4e1b8ab
child 56	d48ab3b357f1