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

equal deleted inserted replaced

-:aecbbf00d063
+:d48ab3b357f1
 /*
-* Copyright (c) 2005-2009 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".
 #include <barsread.h>
 #include <aknlayoutscalable_avkon.cdl.h>
 #include <eikapp.h>
 #include <aknappui.h>
 #include <AknDef.h>
+#include <touchfeedback.h>
+#include <akntranseffect.h>
+#include <akntransitionutils.h>
 #include "aknstyluspopupmenu.h"
 #include "aknstyluspopupmenucontent.h"
 const TInt KDefaultPopUpShowDelay = 0;
 const TInt KDefaultPopUpHideDelay = 6000000; // 6 seconds
 // Default constructor
 // ---------------------------------------------------------------------------
 //
 CAknStylusPopUpMenu::CAknStylusPopUpMenu( MEikMenuObserver* aObserver,
 const TPoint& aPoint,
-CAknPreviewPopUpController* aPopup )
+CAknPreviewPopUpController* aPopup,
+const TInt aFlags )
 : iPosition ( aPoint ),
 iMenuObserver( aObserver ),
 iPreviewPopup( aPopup ),
-iPositionType( EPositionTypeLeftTop )
+iPositionType( EPositionTypeLeftTop ),
+iModeFlags ( aFlags )
 {
 }
 // ---------------------------------------------------------------------------
 aPopup );
 CleanupStack::Pop( self );
 return self;
 }
+// ---------------------------------------------------------------------------
+// CAknStylusPopUpMenu::NewL
+// ---------------------------------------------------------------------------
+//
+CAknStylusPopUpMenu* CAknStylusPopUpMenu::NewL( MEikMenuObserver* aObserver,
+const TPoint& aPoint,
+CAknPreviewPopUpController* aPopup,
+const TInt aFlags )
+{
+CAknStylusPopUpMenu* self = new ( ELeave ) CAknStylusPopUpMenu( aObserver,
+aPoint,
+aPopup,
+aFlags );
+CleanupStack::PushL( self );
+self->ConstructL();
+CleanupStack::Pop( self );
+return self;
+}
 // ---------------------------------------------------------------------------
 // CAknStylusPopUpMenu::NewL
 // ---------------------------------------------------------------------------
 //
 // Destructor
 // ---------------------------------------------------------------------------
 //
 CAknStylusPopUpMenu::~CAknStylusPopUpMenu()
 {
+if ( iContent )
+{
+iContent->SetObserver(NULL);
+}
 if ( iIsDeleted )
 {
 *iIsDeleted = ETrue;
 iIsDeleted = NULL;
 }
 // CAknStylusPopUpMenu::ShowMenu
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CAknStylusPopUpMenu::ShowMenu()
 {
-TRAPD( err,
+// if contoller exists, re-use it .
-iController = CAknPreviewPopUpController::NewL( *iContent,
+if ( !iController )
-CAknPreviewPopUpController::ELayoutSubMenu |
+{
-CAknPreviewPopUpController::EAutoMirror |
+TInt err ( KErrNone );
-CAknPreviewPopUpController::EDontClose ) );
-if ( err )
+if ( iModeFlags & EConsumeKeyEvents )
 {
-return;
+TRAP( err, iController = CAknPreviewPopUpController::NewL(
-}
+*iContent,
+CAknPreviewPopUpController::ELayoutSubMenu |
+CAknPreviewPopUpController::EAutoMirror |
+CAknPreviewPopUpController::EDontClose |
+CAknPreviewPopUpController::EConsumeKeys ) );
+}
+else
+{
+TRAP( err, iController = CAknPreviewPopUpController::NewL(
+*iContent,
+CAknPreviewPopUpController::ELayoutSubMenu |
+CAknPreviewPopUpController::EAutoMirror |
+CAknPreviewPopUpController::EDontClose ) );
+}
+if ( err )
+{
+return;
+}
 iController->SetPopUpShowDelay( KDefaultPopUpShowDelay );
 iController->SetPopUpHideDelay( KDefaultPopUpHideDelay );
-iContent->Parent()->DrawableWindow()->SetNonFading(ETrue);
+}
 TSize size(iController->Size());
 iController->ShowPopUp();
+if ( AknLayoutUtils::PenEnabled() )
+{
+MTouchFeedback* feedback = MTouchFeedback::Instance();
+if ( feedback )
+{
+TTouchLogicalFeedback feedbackType = ETouchFeedbackPopUp;
+if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
+{
+feedbackType = ETouchFeedbackOptionsMenuOpened;
+}
+feedback->InstantFeedback(
+iContent,
+feedbackType,
+ETouchFeedbackVibra,
+TPointerEvent() );
+}
+}
 if ( size.iWidth == 0 && size.iHeight == 0 )
 {
 if ( iPositionType != KErrNotFound )
 {
 SetPosition( iPosition, TPositionType( iPositionType ) );
 // ---------------------------------------------------------------------------
 // CAknStylusPopUpMenu::SetPosition
 // ---------------------------------------------------------------------------
 //
-EXPORT_C void CAknStylusPopUpMenu::SetPosition( const TPoint& aPoint, TPositionType aPosType )
+EXPORT_C void CAknStylusPopUpMenu::SetPosition( const TPoint& aPoint,
+TPositionType aPosType )
 {
 TPoint adjustedPoint( aPoint );
 if ( !iController )
 {
 iPosition = aPoint;
 iPositionType = aPosType;
 return;
 }
 iController->UpdateContentSize();
 TSize menuSize = iController->Size();
-	// calculate to right-top corner by aPosType and popup menu size
+	// Calculate the position to right-top corner by aPosType and
+// popup menu size. Add also a margin between the screen borders and the
+// popup if the popup is too close to screen border.
+TBool layoutMirrored( AknLayoutUtils::LayoutMirrored() );
+TRect screenRect;
+AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen,
+screenRect );
+// Margin is read from the popup window's layout data
+// (left parameter used).
+TAknWindowLineLayout popupWindowLayout(
+AknLayoutScalable_Avkon::popup_touch_menu_window( 0 ).LayoutLine() );
+TInt windowMargin = layoutMirrored ? popupWindowLayout.ir :
+popupWindowLayout.il;
 switch ( aPosType )
 {
 case EPositionTypeRightTop:
+{
 break;
+}
 case EPositionTypeLeftTop:
-if( AknLayoutUtils::LayoutMirrored() )
+{
-{
+if ( !layoutMirrored )
-adjustedPoint.iX -= menuSize.iWidth;
-}
-else
 {
 adjustedPoint.iX += menuSize.iWidth;
 }
-break;
+break;
+}
 case EPositionTypeRightBottom:
+{
 adjustedPoint.iY -= menuSize.iHeight;
 break;
-case EPositionTypeLeftBottom:
+}
-if( AknLayoutUtils::LayoutMirrored() )
-{
+case EPositionTypeLeftBottom:
-adjustedPoint.iX -= menuSize.iWidth;
+{
-}
+if ( !layoutMirrored )
-else
 {
 adjustedPoint.iX += menuSize.iWidth;
 }
 adjustedPoint.iY -= menuSize.iHeight;
-break;
+break;
+}
 default:
-break;
+{
+break;
 }
+}
+// Check if margins need to be added.
+TInt xLeftPos( layoutMirrored ? adjustedPoint.iX :
+adjustedPoint.iX - menuSize.iWidth );
+TInt xRightPos( layoutMirrored ? adjustedPoint.iX + menuSize.iWidth :
+adjustedPoint.iX );
+TInt xPosRightMargin( screenRect.iBr.iX - windowMargin );
+TInt xPosBottomMargin( screenRect.iBr.iY - windowMargin );
+if ( xLeftPos < windowMargin )
+{
+// Too close to the left side of the screen.
+adjustedPoint.iX = windowMargin + menuSize.iWidth;
+}
+else if ( xRightPos > xPosRightMargin )
+{
+// Too close to the right side of the screen.
+if ( layoutMirrored )
+{
+// In mirrored layout a left-top position must be provided
+// for the preview popup controller.
+adjustedPoint.iX = xPosRightMargin - menuSize.iWidth;
+}
+else
+{
+adjustedPoint.iX = xPosRightMargin;
+}
+}
+if ( adjustedPoint.iY < windowMargin )
+{
+// Too close to the top border of the screen.
+adjustedPoint.iY = windowMargin;
+}
+else if ( adjustedPoint.iY + menuSize.iHeight > xPosBottomMargin )
+{
+// Too close to the bottom border of the screen.
+adjustedPoint.iY = xPosBottomMargin - menuSize.iHeight;
+}
 iPosition = adjustedPoint;
 iController->SetPosition( adjustedPoint );
 }
 iController->HidePopUp();
 }
 if ( iMenuObserver )
 {
+TBool isAlreadySet = iFlags.IsSet( EIdleDisabled );
 iFlags.Set( EIdleDisabled );
 TBool isDeleted = EFalse;
 iIsDeleted = &isDeleted;
+CleanupStack::PushL( TCleanupItem( CleanLocalRef, this ) );
 iMenuObserver->ProcessCommandL( iContent->CurrentCommandId() );
+CleanupStack::Pop();
 if ( isDeleted )
 {
 return;
 }
 iIsDeleted = NULL;
-iFlags.Clear( EIdleDisabled );
+if( !isAlreadySet )
+{
+iFlags.Clear( EIdleDisabled );
+}
 }
 StartControllerIdleL();
 }
 else if ( aControl && aEventType == EEventRequestExit )
 {
 if ( iPreviewPopup )
 {
 iPreviewPopup->HidePopUp();
 }
 if ( iController )
 {
 iController->HidePopUp();
 }
 }
 else if ( aControl && aEventType == EEventRequestCancel )
 {
 if ( iMenuObserver )
 {
+TBool isAlreadySet = iFlags.IsSet( EIdleDisabled );
 iFlags.Set( EIdleDisabled );
 iMenuObserver->ProcessCommandL( KErrCancel );
-iFlags.Clear( EIdleDisabled );
+if( !isAlreadySet )
+{
+iFlags.Clear( EIdleDisabled );
+}
 }
 StartControllerIdleL();
 }
 }
 if ( iController )
 {
 iController->UpdateContentSize();
 }
 }
+// ---------------------------------------------------------------------------
+// CAknStylusPopUpMenu::HideMenu
+// ---------------------------------------------------------------------------
+//
+void CAknStylusPopUpMenu::HideMenu()
+{
+if ( iController )
+{
+iController->HidePopUp();
+}
+}
 // -----------------------------------------------------------------------------
 // CAknStylusPopUpMenu::StartControllerIdleL
 // -----------------------------------------------------------------------------
 //
 {
 delete iController;
 iController = NULL;
 }
 }
+// -----------------------------------------------------------------------------
+// CAknStylusPopUpMenu::CleanLocalRef
+// -----------------------------------------------------------------------------
+//
+void CAknStylusPopUpMenu::CleanLocalRef( TAny* aParam )
+{
+static_cast<CAknStylusPopUpMenu*>( aParam )->iIsDeleted = NULL;
+}

branch	RCL_3
changeset 56	d48ab3b357f1
parent 55	aecbbf00d063
child 64	85902f042028