MCL/sf/mw/classicui: comparison uifw/AvKon/src/AknPreviewPopUp.cpp

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 #include <aknbutton.h>
 #include <vwsdef.h>
 #include <aknview.h>
 #include <apgwgnam.h>
 #include <aknlayoutscalable_avkon.cdl.h>
-#include <akntransitionutils.h>
 #include <AknTasHook.h> // for testability hooks
 #include <touchfeedback.h>
-#include <gfxtranseffect/gfxtranseffect.h>
-#include <akntranseffect.h>
-#include <akntransitionutils.h>
 const TInt KWindowPosition = 1000;             // window's position
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
 // CAknPreviewPopUp::NewL
 // -----------------------------------------------------------------------------
 //
+#if defined( RD_SCALABLE_UI_V2 ) || defined( RD_PREVIEW_POPUP )
 CAknPreviewPopUp* CAknPreviewPopUp::NewL( CCoeControl& aContent,
 CAknPreviewPopUpController& aController,
 const TInt aStyle )
 {
 CAknPreviewPopUp* self = new ( ELeave ) CAknPreviewPopUp( aContent,
 : iContent( aContent ),
 iController( aController ),
 iFlags( aStyle ),
 iAllowUpEvent(EFalse)
 {
-GfxTransEffect::Register( this, KGfxPreviewPopupControlUid );
 }
 // -----------------------------------------------------------------------------
 // CAknPreviewPopUp::~CAknPreviewPopUp
 // -----------------------------------------------------------------------------
 //
 CAknPreviewPopUp::~CAknPreviewPopUp()
 {
-if( iIsDeleted )
-{
-	*iIsDeleted = ETrue ;
-iIsDeleted = 0 ;
-}
-if ( IsVisible() )
-{
-iCloseMenu = ETrue;
-iController.HidePopUp();
-}
 AKNTASHOOK_REMOVE();
-GfxTransEffect::Deregister( this );
 if ( CapturesPointer() )
 {
 SetPointerCapture( EFalse );
 }
 TRect nullRect( 0,0,0,0 );
 iBgContext = CAknsFrameBackgroundControlContext::NewL(
 iFrameId, nullRect, nullRect, EFalse );
-CreateWindowL();
-EnableWindowTransparency();
-TInt stackPriority = ECoeStackPriorityCba;
 if ( !( iFlags & CAknPreviewPopUpController::EPermanentMode ) )
 {
+CreateWindowL();
+// try to enable window transparency
+if( CAknEnv::Static()->TransparencyEnabled() )
+{
+Window().SetRequiredDisplayMode( EColor16MA );
+if ( Window().SetTransparencyAlphaChannel() == KErrNone )
+{
+Window().SetBackgroundColor( ~0 );
+}
+}
+iAvkonAppUi->AddToStackL( this, ECoeStackPriorityCba,
+ECoeStackFlagRefusesAllKeys |
+ECoeStackFlagRefusesFocus );
 Window().SetPointerGrab( ETrue );
 SetGloballyCapturing( ETrue );
+//fix for TSW error PTPA-7HNA25
 Window().SetOrdinalPosition(KWindowPosition);
 }
 else
 {
-stackPriority = ECoeStackPriorityDefault;
+CreateWindowL();
+// try to enable window transparency
+if( CAknEnv::Static()->TransparencyEnabled() )
+{
+Window().SetRequiredDisplayMode( EColor16MA );
+if ( Window().SetTransparencyAlphaChannel() == KErrNone )
+{
+Window().SetBackgroundColor( ~0 );
+}
+}
+iAvkonAppUi->AddToStackL( this, ECoeStackPriorityDefault,
+ECoeStackFlagRefusesAllKeys |
+ECoeStackFlagRefusesFocus );
 Window().SetOrdinalPosition( 0, ECoeWinPriorityNormal );
 }
-iAvkonAppUi->AddToStackL( this, stackPriority,
-ECoeStackFlagRefusesAllKeys |
-ECoeStackFlagRefusesFocus );
 EnableDragEvents();
 SetComponentsToInheritVisibility( ETrue );
 iContent.SetBackground( this );
 iContent.SetContainerWindowL( *this );
 iContent.ActivateL();
 layoutRect.LayoutRect( appWindow, AknLayoutScalable_Avkon::popup_preview_fixed_window().LayoutLine() );
 SetRect( layoutRect.Rect() );
 }
+DrawableWindow()->EnableBackup( EWindowBackupAreaBehind );
 MakeVisible( EFalse );
 ActivateL();
 }
 // -----------------------------------------------------------------------------
 //
 void CAknPreviewPopUp::Show()
 {
 if ( !( iFlags & CAknPreviewPopUpController::EPermanentMode ) )
 {
+//fix for TSW error PTPA-7HNA25
 Window().SetOrdinalPosition( 0 );
 iAvkonAppUi->UpdateStackedControlFlags( this, NULL,
 ECoeStackFlagRefusesAllKeys );
-SetPointerCapture( ETrue );
+if ( AknLayoutUtils::PenEnabled() )
+{
+SetPointerCapture( ETrue );
+}
 }
 iCloseMenu = EFalse;
-TBool useTfx = !( iFlags & CAknPreviewPopUpController::EPermanentMode
+Window().Invalidate();
-|| iFlags & CAknPreviewPopUpController::EFixedMode );
+MakeVisible( ETrue );
-if ( useTfx && GfxTransEffect::IsRegistered( this ) )
-{
-GfxTransEffect::Begin( this, KGfxControlAppearAction );
-MakeVisible( ETrue );
-GfxTransEffect::SetDemarcation( this, iPosition );
-GfxTransEffect::End( this );
-}
-else
-{
-MakeVisible( ETrue );
-}
 if( GrabbingComponent() )
 {
 iCloseMenu = ETrue;
 }
 iController.NotifyObservers( MAknPreviewPopUpObserver::EPreviewPopUpShown );
 !( iFlags & CAknPreviewPopUpController::EPermanentMode ) ) )
 {
 return;
 }
-// Skip disappear transition if the popup is either permanent, fixed or
-// faded. Fading status is checked because there can't be two parallel
-// effects applied to the same window.
-TBool useTfx = !( iFlags & CAknPreviewPopUpController::EPermanentMode
-|| iFlags & CAknPreviewPopUpController::EFixedMode )
-&& !Window().IsFaded();
-if ( useTfx && GfxTransEffect::IsRegistered( this ) )
-{
-GfxTransEffect::Begin( this, KGfxControlDisappearAction );
-MakeVisible( EFalse );
-GfxTransEffect::End( this );
-}
-else
-{
-MakeVisible( EFalse );
-}
 Window().ClearRedrawStore();
+MakeVisible( EFalse );
 if ( !( iFlags & CAknPreviewPopUpController::EPermanentMode ) )
 {
+//fix for TSW error PTPA-7HNA25
 Window().SetOrdinalPosition( KWindowPosition );
 iAvkonAppUi->UpdateStackedControlFlags( this,
 ECoeStackFlagRefusesAllKeys,
 ECoeStackFlagRefusesAllKeys );
 }
 AknsDrawUtils::Background( skin, cc, this, aGc, aRect );
 }
 }
+// -----------------------------------------------------------------------------
+// CAknPreviewPopUp::MakeVisible
+// -----------------------------------------------------------------------------
+//
+void CAknPreviewPopUp::MakeVisible( TBool aVisible )
+{
+if ( aVisible != IsVisible() )
+{
+CCoeControl::MakeVisible( aVisible );
+}
+}
 // -----------------------------------------------------------------------------
 // CAknPreviewPopUp::CountComponentControls
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 // CAknPreviewPopUp::HandlePointerEventL
 // -----------------------------------------------------------------------------
 //
 void CAknPreviewPopUp::HandlePointerEventL( const TPointerEvent& aPointerEvent )
 {
-	TBool isDelete = EFalse;
-	iIsDeleted = &isDelete;
 if ( AknLayoutUtils::PenEnabled() )
 {
 iCloseMenu = EFalse;
 if ( aPointerEvent.iType == TPointerEvent::EButton1Up && !IsVisible() )
 {
 SetPointerCapture( EFalse );
 }
+CAknTouchPane* touchPane = iAvkonAppUi->TouchPane();
 // redirect pointer event to content
 if ( Rect().Contains( aPointerEvent.iPosition ) && IsVisible() )
 {
 iAllowUpEvent = ETrue;
-CleanupStack::PushL( TCleanupItem( CleanLocalRef, this ) );
 CCoeControl::HandlePointerEventL( aPointerEvent );
-CleanupStack::Pop();
-if( isDelete )
-	{
-	return;
-	}
 if ( !( iFlags & CAknPreviewPopUpController::EPermanentMode ) && aPointerEvent.iType == TPointerEvent::EButton1Up && IsVisible() )
 {
 	  // if pointer up is already redirected to the content, but the popup is still visible,
 	  // then the original timeout has already happened and we need to reset the timer.
 	  // TSW Error EJZG-7JR3PC.
 	  iController.ResetTimer();
 }
 }
 else
 {
+if ( touchPane )
+{
+if ( touchPane->IsVisible() )
+{
+// touchpane is a window-owning control -> Rect() cannot be used
+TRect touchPaneRect( touchPane->Position(), touchPane->Size() );
+if ( touchPaneRect.Contains( aPointerEvent.iParentPosition ) )
+{
+TPointerEvent pointerEvent( aPointerEvent );
+// make event's coordinates touch pane relative
+pointerEvent.iPosition = aPointerEvent.iParentPosition -
+touchPaneRect.iTl;
+static_cast<CCoeControl*>( touchPane )->HandlePointerEventL(
+pointerEvent );
+}
+}
+}
 if ( !( iFlags & CAknPreviewPopUpController::EPermanentMode ) &&
 aPointerEvent.iType != TPointerEvent::EDrag &&
 aPointerEvent.iType != TPointerEvent::EButtonRepeat )
 {
 // All other events outside popup's rect (mainly down)
 // hides the popup
 if ( aPointerEvent.iType != TPointerEvent::EButton1Up )
 {
-// popup will be hiden when EButton1Down comes.
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if ( feedback )
 {
-TTouchLogicalFeedback feedbackType = ETouchFeedbackPopUp;
+feedback->InstantFeedback( ETouchFeedbackPopUp );
-if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
-{
-feedbackType = ETouchFeedbackOptionsMenuClosed;
-}
-feedback->InstantFeedback( feedbackType );
 }
 iCloseMenu = ETrue;
 iController.HidePopUp();
 }
 else if ( IsVisible() )
 ETouchFeedbackVibra,
 aPointerEvent );
 }
 else
 {
-// popup will be hiden when EButton1Down comes.
-TTouchLogicalFeedback feedbackType = ETouchFeedbackPopUp;
-if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
-{
-feedbackType = ETouchFeedbackOptionsMenuClosed;
-}
 feedback->InstantFeedback( this,
-feedbackType,
+ETouchFeedbackPopUp,
 aPointerEvent );
 }
 }
 iCloseMenu = ETrue;
 iController.HidePopUp();
 }
 }
 // If EDontClose flag is on, also button up is forwarded for base class
 if ( iFlags & CAknPreviewPopUpController::EDontClose )
 {
 if ( aPointerEvent.iType == TPointerEvent::EDrag ||
 aPointerEvent.iType == TPointerEvent::EButtonRepeat ||
 (aPointerEvent.iType == TPointerEvent::EButton1Up && iAllowUpEvent ) )
 {
-CleanupStack::PushL( TCleanupItem( CleanLocalRef, this ) );
 CCoeControl::HandlePointerEventL( aPointerEvent );
-CleanupStack::Pop();
-if( isDelete )
-	{
-	return;
-	}
 }
 }
 else
 {
 if ( aPointerEvent.iType == TPointerEvent::EDrag ||
 aPointerEvent.iType == TPointerEvent::EButtonRepeat )
 {
-CleanupStack::PushL( TCleanupItem( CleanLocalRef, this ) );
 CCoeControl::HandlePointerEventL( aPointerEvent );
-CleanupStack::Pop();
-if( isDelete )
-	{
-	return;
-	}
 }
 }
 }
 if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
 {
 iAllowUpEvent = EFalse;
 }
 }
-iIsDeleted = NULL;
 }
 // -----------------------------------------------------------------------------
 // CAknPreviewPopUp::OfferKeyEventL
 // -----------------------------------------------------------------------------
 //
 TKeyResponse CAknPreviewPopUp::OfferKeyEventL( const TKeyEvent& /*aKeyEvent*/,
-TEventCode aType )
+TEventCode /*aType*/ )
 {
-TKeyResponse ret ( EKeyWasNotConsumed );
 if ( !( iFlags & CAknPreviewPopUpController::EPermanentMode ) )
 {
-if ( !( iFlags & CAknPreviewPopUpController::EConsumeKeys ) )
+iCloseMenu = ETrue;
-{
+iController.HidePopUp();
-iCloseMenu = ETrue;
+}
-iController.HidePopUp();
+if ( CapturesPointer() )
+{
+SetPointerCapture( EFalse );
+}
+return EKeyWasNotConsumed;
+}
+// -----------------------------------------------------------------------------
+// CAknPreviewPopUp::MopSupplyObject
+// -----------------------------------------------------------------------------
+//
+TTypeUid::Ptr CAknPreviewPopUp::MopSupplyObject( TTypeUid aId )
+{
+if ( aId.iUid == MAknsControlContext::ETypeId )
+{
+if ( iBgContext )
+{
+return MAknsControlContext::SupplyMopObject( aId, iBgContext );
 }
 else
 {
-if ( aType == EEventKey || aType == EEventKeyUp )
-{
-iCloseMenu = ETrue;
-iController.HidePopUp();
-ret = EKeyWasConsumed;
-}
-}
-}
-if ( CapturesPointer() )
-{
-SetPointerCapture( EFalse );
-}
-return ret;
-}
-// -----------------------------------------------------------------------------
-// CAknPreviewPopUp::MopSupplyObject
-// -----------------------------------------------------------------------------
-//
-TTypeUid::Ptr CAknPreviewPopUp::MopSupplyObject( TTypeUid aId )
-{
-if ( aId.iUid == MAknsControlContext::ETypeId )
-{
-if ( iBgContext )
-{
-return MAknsControlContext::SupplyMopObject( aId, iBgContext );
-}
-else
-{
 return TTypeUid::Null();
 }
 }
 return CCoeControl::MopSupplyObject( aId );
 // CAknPreviewPopUp::Draw
 // -----------------------------------------------------------------------------
 //
 void CAknPreviewPopUp::Draw( const TRect& aRect ) const
 {
-CWindowGc& gc = SystemGc();
+if( CAknEnv::Static()->TransparencyEnabled() )
+{
-TRegionFix<4> region;
-region.AddRect( Rect() );
+CWindowGc& gc = SystemGc();
-region.SubRect( iContent.Rect() );
-gc.SetClippingRegion( region );
+TRegionFix< 4 > region;
+region.AddRect( Rect() );
-DrawBackground( gc, aRect );
+region.SubRect( iContent.Rect() );
+gc.SetClippingRegion( region );
-gc.CancelClippingRegion();
+DrawBackground( gc, aRect );
+gc.CancelClippingRegion();
+}
+else
+{
+CWindowGc& gc = SystemGc();
+MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+if ( !AknsDrawUtils::Background( skin, iBgContext, gc, aRect ) )
+{
+gc.Clear( aRect );
+}
+if ( HasHeading() )
+{
+gc.SetClippingRect( aRect );
+// heading graphics
+TAknLayoutRect layoutRect;
+layoutRect.LayoutRect( Rect(),
+TAknWindowComponentLayout::Compose(
+AknLayoutScalable_Avkon::heading_preview_pane(),
+AknLayoutScalable_Avkon::bg_popup_heading_pane_cp2( 1 ) ).LayoutLine() );
+TRect outerRect( layoutRect.Rect() );
+layoutRect.LayoutRect( outerRect,
+AknLayoutScalable_Avkon::bg_popup_heading_pane_g1() );
+// There's no error checking since if skinned drawing fails heading
+// text will be drawn on top of the background.
+AknsDrawUtils::DrawFrame( skin, gc, outerRect, layoutRect.Rect(),
+KAknsIIDQsnFrPopupHeading, KAknsIIDDefault );
+// heading text
+TAknLayoutText textLayout;
+textLayout.LayoutText( Rect(),
+TAknWindowComponentLayout::ComposeText(
+AknLayoutScalable_Avkon::heading_preview_pane(),
+AknLayoutScalable_Avkon::heading_preview_pane_t1( 1 ) ).LayoutLine() );
+gc.SetBrushStyle( CGraphicsContext::ENullBrush );
+TRgb color( textLayout.Color() );
+if ( iFlags & CAknPreviewPopUpController::ELayoutSubMenu )
+{
+AknsUtils::GetCachedColor( skin, color, KAknsIIDQsnTextColors,
+EAknsCIQsnTextColorsCG55 );
+}
+else
+{
+AknsUtils::GetCachedColor( skin, color, KAknsIIDQsnTextColors,
+EAknsCIQsnTextColorsCG19 );
+}
+textLayout.DrawText( gc, *iHeadingText, ETrue, color );
+gc.CancelClippingRect();
+}
+}
 }
 // -----------------------------------------------------------------------------
 // CAknPreviewPopUp::CenterLayout
 // -----------------------------------------------------------------------------
 aGc.CancelClippingRect();
 }
 }
-// -----------------------------------------------------------------------------
+#endif // RD_SCALABLE_UI_V2 || RD_PREVIEW_POPUP
-// CAknPreviewPopUp::CleanLocalRef
-// -----------------------------------------------------------------------------
-//
-void CAknPreviewPopUp::CleanLocalRef( TAny* aParam )
-{
-static_cast<CAknPreviewPopUp*>( aParam )->iIsDeleted = NULL;
-}
 //  End of File

branch	RCL_3
changeset 19	aecbbf00d063
parent 18	fcdfafb36fe7
child 20	d48ab3b357f1