--- a/uifw/AvKon/src/akndiscreetpopupcontrol.cpp Mon Mar 08 21:43:43 2010 +0000
+++ b/uifw/AvKon/src/akndiscreetpopupcontrol.cpp Sun Mar 14 13:10:48 2010 +0000
@@ -31,6 +31,7 @@
#include <avkon.hrh>
#include "akndiscreetpopupcontrol.h"
#include "akndiscreetpopupdrawer.h"
+#include "akntrace.h"
_LIT( KDiscreetPopupWindowGroupName, "Discreet pop-up" );
@@ -72,6 +73,7 @@
const TInt& aPopupId,
MEikCommandObserver* aCommandObserver )
{
+ _AKNTRACE_FUNC_ENTER;
CAknDiscreetPopupControl* self =
CAknDiscreetPopupControl::NewLC( aGlobal,
aTitle,
@@ -86,6 +88,7 @@
aPopupId,
aCommandObserver );
CleanupStack::Pop( self );
+ _AKNTRACE_FUNC_EXIT;
return self;
}
@@ -102,6 +105,7 @@
const TInt& aPopupId,
MEikCommandObserver* aCommandObserver )
{
+ _AKNTRACE_FUNC_ENTER;
CAknDiscreetPopupControl* self =
CAknDiscreetPopupControl::NewLC( aGlobal,
aCommand,
@@ -110,6 +114,7 @@
self->ConstructFromResourceL( aResourceId, aResourceFile );
CleanupStack::Pop( self );
+ _AKNTRACE_FUNC_EXIT;
return self;
}
@@ -175,6 +180,7 @@
//
CAknDiscreetPopupControl::~CAknDiscreetPopupControl()
{
+ _AKNTRACE_FUNC_ENTER;
AKNTASHOOK_REMOVE();
if ( IsVisible() )
{
@@ -189,6 +195,7 @@
}
delete iTimer;
delete iDrawer;
+ _AKNTRACE_FUNC_EXIT;
}
@@ -401,6 +408,7 @@
//
void CAknDiscreetPopupControl::DoTimeOut()
{
+ _AKNTRACE_FUNC_ENTER;
if ( !iInternalFlags.IsSet( EPressedDown ) )
{
TRAP_IGNORE( RequestExitL() );
@@ -409,6 +417,7 @@
{
iTimer->Cancel();
}
+ _AKNTRACE_FUNC_EXIT;
}
@@ -419,6 +428,7 @@
//
void CAknDiscreetPopupControl::RequestExitL()
{
+ _AKNTRACE_FUNC_ENTER;
if( iCommandObserver && !iInternalFlags.IsSet( EGlobal ) )
{
iCommandObserver->ProcessCommandL( EAknDiscreetPopupCmdClose );
@@ -426,6 +436,7 @@
HidePopup();
ReportEventL( MCoeControlObserver::EEventRequestExit );
iInternalFlags.Clear( EPressedDown );
+ _AKNTRACE_FUNC_EXIT;
}
@@ -435,12 +446,15 @@
//
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
ImmediateFeedback( ETouchFeedbackSensitive );
iCommandObserver->ProcessCommandL( iCommand );
}
+ _AKNTRACE_FUNC_EXIT;
}
@@ -530,6 +544,7 @@
//
void CAknDiscreetPopupControl::ShowPopupL()
{
+ _AKNTRACE_FUNC_ENTER;
AppUi()->AddToStackL(
this,
ECoeStackPriorityDefault,
@@ -563,6 +578,8 @@
iTimer->Start( timeout,
0,
TCallBack( TimeOut, this ) );
+
+ _AKNTRACE_FUNC_EXIT;
}
@@ -695,6 +712,7 @@
//
void CAknDiscreetPopupControl::HandleResourceChange( TInt aType )
{
+ _AKNTRACE_FUNC_ENTER;
CAknControl::HandleResourceChange( aType );
switch ( aType )
{
@@ -720,6 +738,7 @@
break;
}
}
+ _AKNTRACE_FUNC_EXIT;
}
@@ -740,6 +759,7 @@
&& eventInRect
&& iInternalFlags.IsClear( EDismissed ) )
{
+ _AKNTRACE( "CAknDiscreetPopupControl::HandlePointerEventL, TPointerEvent::EButton1Down" );
SetPressedDownState( ETrue );
ImmediateFeedback( ETouchFeedbackSensitive );
}
@@ -747,6 +767,7 @@
// 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 ) )
{
@@ -761,6 +782,7 @@
// Pointer up - reset pressed-down state
else if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
{
+ _AKNTRACE( "CAknDiscreetPopupControl::HandlePointerEventL, TPointerEvent::EButton1Up" );
if ( eventInRect )
{
NotifyObserverL();