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

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 #include <AknUtils.h>
 #include <apgwgnam.h>
 #include <bautils.h>
 #include <barsread.h>
 #include <gulicon.h>
-#include <gfxtranseffect/gfxtranseffect.h>
-#include <akntransitionutils.h>
 #include <avkon.hrh>
 #include "akndiscreetpopupcontrol.h"
 #include "akndiscreetpopupdrawer.h"
-#include "akntrace.h"
 _LIT( KDiscreetPopupWindowGroupName, "Discreet pop-up" );
+const TInt KOpacityChangeSpeed( 18 );
+const TInt KAlphaMax( 255 );
+const TInt KAlphaMin( 0 );
 const TInt KShortTimeout( 1500000 );
 const TInt KLongTimeout( 3000000 );
+const TInt KShowDelay( 300000 );
+const TInt KShowInterval( 50000 );
+const TInt KHideDelay( 50000 );
+const TInt KHideInterval( 50000 );
 const TInt KGlobalShowOrdinalPriority( ECoeWinPriorityAlwaysAtFront * 4 );
 const TInt KLocalShowOrdinalPriority( ECoeWinPriorityNormal + 1 );
 const TInt KLocalHideOrdinalPosition( -10 );
+const TInt KOpacityDismissFactor( 3 );
+const TInt KMaxFadeTime( 1000000 );
 /**
 * Internal discreet popup control flags.
 */
 enum TAknDiscreetPopupControlFlags
 {
 EPressedDown,     // Pointer down is received in popup area
 EDismissed,       // Popup is dismissed (pointer up is received in popup area)
 EGlobal,          // Popup is global
-EDragged,         // Pointer is dragged while popup open
+EFading,          // Popup is closing (fading)
-EStartTimerAgain  // Start timer again when timer is out and keep pressing
+EDragged          // Pointer is dragged while popup open
 };
 // ======== MEMBER FUNCTIONS ========
 const TInt& aFlags,
 const TInt& aCommand,
 const TInt& aPopupId,
 MEikCommandObserver* aCommandObserver )
 {
-_AKNTRACE_FUNC_ENTER;
 CAknDiscreetPopupControl* self =
 CAknDiscreetPopupControl::NewLC( aGlobal,
 aTitle,
 aText,
 aIcon,
 aFlags,
 aCommand,
 aPopupId,
 aCommandObserver );
 CleanupStack::Pop( self );
-_AKNTRACE_FUNC_EXIT;
 return self;
 }
 // ---------------------------------------------------------------------------
 const TDesC& aResourceFile,
 const TInt& aCommand,
 const TInt& aPopupId,
 MEikCommandObserver* aCommandObserver )
 {
-_AKNTRACE_FUNC_ENTER;
 CAknDiscreetPopupControl* self =
 CAknDiscreetPopupControl::NewLC( aGlobal,
 aCommand,
 aPopupId,
 aCommandObserver );
 self->ConstructFromResourceL( aResourceId, aResourceFile );
 CleanupStack::Pop( self );
-_AKNTRACE_FUNC_EXIT;
 return self;
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupControl::~CAknDiscreetPopupControl
 // ---------------------------------------------------------------------------
 //
 CAknDiscreetPopupControl::~CAknDiscreetPopupControl()
 {
-_AKNTRACE_FUNC_ENTER;
 AKNTASHOOK_REMOVE();
 if ( IsVisible() )
 {
 HidePopup();
 }
+if ( iInternalFlags.IsSet( EGlobal ) )
-GfxTransEffect::Deregister( this );
+{
+iWindowGroup.Close();
+}
 delete iTimer;
 delete iDrawer;
-if ( iInternalFlags.IsSet( EGlobal ) )
-{
-CloseWindow();
-iWindowGroup.Close();
-}
-_AKNTRACE_FUNC_EXIT;
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupControl::HandleDiscreetPopupActionL
 // CAknDiscreetPopupControl::MakeVisible
 // ---------------------------------------------------------------------------
 //
 void CAknDiscreetPopupControl::MakeVisible( TBool aVisible )
 {
+if ( iTimer )
+{
+iTimer->Cancel();
+}
 CCoeControl::MakeVisible( aVisible );
 if( iInternalFlags.IsSet( EGlobal ) )
 {
 iWindowGroup.SetOrdinalPosition( 0, KGlobalShowOrdinalPriority );
 }
 else
 {
 Window().SetOrdinalPosition( 0, KLocalShowOrdinalPriority );
 }
+if ( aVisible && iTimer )
+{
+iAlpha = 0;
+iInternalFlags.Clear( EFading );
+iInternalFlags.Clear( EDismissed );
+iTimer->Start( KShowDelay,
+KShowInterval,
+TCallBack( TimeOut, this ) );
+iFadeTime.HomeTime();
+TTimeIntervalMicroSeconds32 timeout( KShowDelay );
+iFadeTime += timeout;
+}
 UpdateNonFadingStatus();
 }
 // ---------------------------------------------------------------------------
 if ( aGlobal || thread.Name() == EIKAPPUI_SERVER_THREAD_NAME )
 {
 iInternalFlags.Set( EGlobal );
 }
 iInternalFlags.Set( EDismissed );
-iCommand = aCommand;
-iCommandObserver = aCommandObserver;
+// Action allowed only when touch enabled
+if ( AknLayoutUtils::PenEnabled() )
-GfxTransEffect::Register( this, KGfxDiscreetPopupControlUid );
+{
+iCommand = aCommand;
+iCommandObserver = aCommandObserver;
+}
 AKNTASHOOK_ADD( this, "CAknDiscreetPopupControl" );
 }
 // ---------------------------------------------------------------------------
 Window().SetOrdinalPosition( KLocalHideOrdinalPosition );
 }
 iTimer = CPeriodic::NewL( 0 );
-EnableWindowTransparency();
+// try to enable window transparency
+if( CAknEnv::Static()->TransparencyEnabled() )
+{
+Window().SetRequiredDisplayMode( EColor16MA );
+if ( Window().SetTransparencyAlphaChannel() == KErrNone )
+{
+Window().SetBackgroundColor( ~0 );
+}
+}
 Window().SetPointerGrab( ETrue );
 EnableDragEvents();
 MakeVisible( EFalse );
 }
 // CAknDiscreetPopupControl::DoTimeOut
 // ---------------------------------------------------------------------------
 //
 void CAknDiscreetPopupControl::DoTimeOut()
 {
-	_AKNTRACE_FUNC_ENTER;
+if ( iInternalFlags.IsSet( EFading ) && iAlpha <= KAlphaMin )
-if ( !iInternalFlags.IsSet( EPressedDown ) ||
+{
-	 iInternalFlags.IsSet( EStartTimerAgain ) )
+// popup has faded completely, exit
-{
 TRAP_IGNORE( RequestExitL() );
 }
 else
 {
-iTimer->Cancel();
+TInt opacityChange =
-// if time is out and keep pressing, start short timer again.
+iInternalFlags.IsSet( EFading ) ? -KOpacityChangeSpeed : KOpacityChangeSpeed;
-iInternalFlags.Set( EStartTimerAgain );
-iTimer->Start( KShortTimeout,
+if ( iInternalFlags.IsSet( EPressedDown )
-0,
+&& iInternalFlags.IsSet( EFading ) )
-TCallBack( TimeOut, this ) );
+{
-}
+iAlpha = KAlphaMax;
-	_AKNTRACE_FUNC_EXIT;
+opacityChange = 0;
+}
+if ( iInternalFlags.IsSet( EDismissed ) )
+{
+opacityChange *= KOpacityDismissFactor;
+}
+iAlpha += opacityChange;
+TTime now;
+now.HomeTime();
+TInt fadeTime( now.MicroSecondsFrom( iFadeTime ).Int64() );
+if ( fadeTime > KMaxFadeTime )
+{
+if ( !iInternalFlags.IsSet( EFading ) )
+{
+// fade in animation is taking too long,
+// make popup fully visible
+iAlpha = KAlphaMax;
+}
+else
+{
+// fade out animation is taking too long,
+// make popup invisible
+iAlpha = KAlphaMin;
+}
+}
+if ( iAlpha >= KAlphaMax )
+{
+// popup is completely visible. set the EFading flag and set timeout
+iAlpha = KAlphaMax;
+iInternalFlags.Set( EFading );
+iTimer->Cancel();
+//fade out after timeout
+TTimeIntervalMicroSeconds32 timeout( KShortTimeout );
+if ( iFlags & KAknDiscreetPopupDurationLong )
+{
+timeout = KLongTimeout;
+}
+iTimer->Start( timeout,
+KHideInterval,
+TCallBack( TimeOut, this ) );
+iFadeTime.HomeTime();
+iFadeTime += timeout;
+}
+else if ( iAlpha < KAlphaMin )
+{
+iAlpha = KAlphaMin;
+}
+DrawNow();
+}
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupControl::RequestExitL
 // Popup exit when popup is completely invisible.
 // ---------------------------------------------------------------------------
 //
 void CAknDiscreetPopupControl::RequestExitL()
 {
-_AKNTRACE_FUNC_ENTER;
 if( iCommandObserver && !iInternalFlags.IsSet( EGlobal ) )
 {
 iCommandObserver->ProcessCommandL( EAknDiscreetPopupCmdClose );
 }
 HidePopup();
 ReportEventL( MCoeControlObserver::EEventRequestExit );
-iInternalFlags.Clear( EStartTimerAgain );
 iInternalFlags.Clear( EPressedDown );
-_AKNTRACE_FUNC_EXIT;
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupControl::NotifyObserverL
 // ---------------------------------------------------------------------------
 //
 void CAknDiscreetPopupControl::NotifyObserverL()
 {
-_AKNTRACE_FUNC_ENTER;
 if ( iCommand != 0 && iCommandObserver )
 {
-_AKNTRACE( "CAknDiscreetPopupControl::NotifyObserverL(), tap event will be disposed." );
 // Play feedback if there is command associated with the popup
-if ( iFeedBack )
+ImmediateFeedback( ETouchFeedbackSensitive );
-{
-iFeedBack->InstantFeedback( this,
-ETouchFeedbackSensitive,
-ETouchFeedbackVibra,
-TPointerEvent()
-);
-}
 iCommandObserver->ProcessCommandL( iCommand );
 }
-_AKNTRACE_FUNC_EXIT;
 }
 // -----------------------------------------------------------------------------
 // CAknDiscreetPopupControl::ImmediateFeedback
 // CAknDiscreetPopupControl::ShowPopupL
 // ---------------------------------------------------------------------------
 //
 void CAknDiscreetPopupControl::ShowPopupL()
 {
-_AKNTRACE_FUNC_ENTER;
 AppUi()->AddToStackL(
 this,
 ECoeStackPriorityDefault,
 ECoeStackFlagRefusesAllKeys |
 ECoeStackFlagRefusesFocus );
 User::ResetInactivityTime();
 PlayTone();
+MakeVisible( ETrue );
-if ( GfxTransEffect::IsRegistered( this ) )
-{
-iInternalFlags.Clear( EDismissed );
-GfxTransEffect::Begin( this, KGfxControlAppearAction );
-MakeVisible( ETrue );
-GfxTransEffect::SetDemarcation( this, iPosition );
-GfxTransEffect::End( this );
-}
-else
-{
-MakeVisible( ETrue );
-}
-TTimeIntervalMicroSeconds32 timeout( KShortTimeout );
-if ( iFlags & KAknDiscreetPopupDurationLong )
-{
-timeout = KLongTimeout;
-}
-iTimer->Start( timeout,
-0,
-TCallBack( TimeOut, this ) );
-	_AKNTRACE_FUNC_EXIT;
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupControl::HidePopup
 // ---------------------------------------------------------------------------
 //
 void CAknDiscreetPopupControl::HidePopup()
 {
-if ( GfxTransEffect::IsRegistered( this ) )
+MakeVisible( EFalse );
-{
-GfxTransEffect::Begin( this, KGfxControlDisappearAction );
-MakeVisible( EFalse );
-GfxTransEffect::End( this );
-}
-else
-{
-MakeVisible( EFalse );
-}
 AppUi()->RemoveFromStack( this );
 }
 // ---------------------------------------------------------------------------
 if ( !iDrawer )
 {
 return;
 }
-iDrawer->Draw( SystemGc(), Rect() );
+CFbsBitmap* popupBitmap( iDrawer->PopupBitmap( Size() ) );
+// create a transparent mask for the popup
+CFbsBitmap* transParentBitmap =
+iDrawer->TransparentMask( popupBitmap->SizeInPixels(), iAlpha );
+// blit the bitmap to screen with the transparent mask
+CWindowGc& gc = SystemGc();
+if( transParentBitmap )
+{
+gc.BitBltMasked( Rect().iTl,
+popupBitmap,
+popupBitmap->SizeInPixels(),
+transParentBitmap,
+EFalse );
+}
+else
+{
+gc.BitBlt( Rect().iTl, popupBitmap );
+}
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupControl::ConstructFromResourceL
 // CAknDiscreetPopupControl::HandleResourceChange
 // ---------------------------------------------------------------------------
 //
 void CAknDiscreetPopupControl::HandleResourceChange( TInt aType )
 {
-_AKNTRACE_FUNC_ENTER;
 CAknControl::HandleResourceChange( aType );
 switch ( aType )
 {
 case KEikDynamicLayoutVariantSwitch:
 {
 default:
 {
 break;
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 // ---------------------------------------------------------------------------
 // CAknDiscreetPopupControl::HandlePointerEventL
 //
 void CAknDiscreetPopupControl::HandlePointerEventL(
 const TPointerEvent& aPointerEvent )
 {
 TBool eventInRect( Rect().Contains( aPointerEvent.iPosition ) );
 // Pointer down - set pressed-down state (popup completely visible while
 // pressed-down)
 if ( aPointerEvent.iType == TPointerEvent::EButton1Down
 && eventInRect
 && iInternalFlags.IsClear( EDismissed ) )
 {
-_AKNTRACE( "CAknDiscreetPopupControl::HandlePointerEventL, TPointerEvent::EButton1Down" );
 SetPressedDownState( ETrue );
-ImmediateFeedback( ETouchFeedbackSensitive );
+// Play feedback only when popup is completely visible (or fading away)
+if ( iInternalFlags.IsSet( EFading ) )
+{
+ImmediateFeedback( ETouchFeedbackSensitive );
+}
 }
 // Pointer drag - reset pressed-down state if pointer out of popup area
 else if ( aPointerEvent.iType == TPointerEvent::EDrag )
 {
-_AKNTRACE( "CAknDiscreetPopupControl::HandlePointerEventL, TPointerEvent::EDrag" );
 iInternalFlags.Set( EDragged );
 if ( !eventInRect && iInternalFlags.IsSet( EPressedDown ) )
 {
 iInternalFlags.Clear( EPressedDown );
 }
 }
 }
 // Pointer up - reset pressed-down state
 else if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
 {
-_AKNTRACE( "CAknDiscreetPopupControl::HandlePointerEventL, TPointerEvent::EButton1Up" );
+if ( iInternalFlags.IsSet( EFading )
-if ( eventInRect )
+&& iInternalFlags.IsSet( EPressedDown )
-{
+&& eventInRect )
+{
+// Notify popup tap
 NotifyObserverL();
-}
+// Start fading away
-// Start fading away
+if ( iInternalFlags.IsClear( EDismissed ) )
-if ( iInternalFlags.IsClear( EDismissed ) )
+{
-{
+iTimer->Cancel();
-iInternalFlags.Set( EDismissed );
+iInternalFlags.Set( EFading );
-RequestExitL();
+iInternalFlags.Set( EDismissed );
+iTimer->Start( KHideDelay, KHideInterval, TCallBack( TimeOut, this ) );
+}
 }
 SetPressedDownState( EFalse );
 }
 }

branch	RCL_3
changeset 19	aecbbf00d063
parent 10	3d340a0166ff
child 20	d48ab3b357f1