FCL/sf/mw/classicui: comparison uifw/AvKon/src/AknNoteDialog.cpp

equal deleted inserted replaced

-:aecbbf00d063
+:d48ab3b357f1
 #include <avkondomainpskeys.h>
 #include <aknglobalpopupprioritycontroller.h>
 #endif
 #include <AknTasHook.h> // for testability hooks
+#include "akntrace.h"
 const TInt EEikDialogFlagSleeping   =0x20000;
 // -----------------------------------------------------------------------------
 // Finds out if this control belongs to the window group that is in focus.
-// This information can be used to skip effects when the window group is
+// This information can be used to skip effects when the window group is not visible.
-// not visible.
 //
-// @param aThis The control in question.
+// @param aControl The control in question.
 //
 // @return ETrue if the window group is in focus, otherwise EFalse
 // -----------------------------------------------------------------------------
 //
-TBool IsFocusedWindowGroup( CAknNoteDialog* aThis )
+TBool IsFocusedWindowGroup( const CCoeControl* aControl )
 {
-RWindowTreeNode* node = aThis->DrawableWindow();
+if( !aControl )
+	{
+	return EFalse;
+	}
+RWindowTreeNode* node = aControl->DrawableWindow();
 // this code finds out if this control belongs to window group
 // that is in focus, there are some rare cases when the latest opened
 // popup goes behind another one (e.g. system lock query -> power key menu)
 // we don't want transition in that case
 RWsSession& wsSession = CEikonEnv::Static()->WsSession();
 if ( !node )
 {
 return EFalse;
 }
 TInt nodeWindowGroupId = node->WindowGroupId();
 TInt focusedWindowGroupId = wsSession.GetFocusWindowGroup();
 if ( nodeWindowGroupId == focusedWindowGroupId )
 {
-return ETrue;
+return aControl->IsFocused();
 }
 TInt count = wsSession.NumWindowGroups( 0 );
 // because there is not leave here,so no need to use CleanupStack.
 {
 return ETrue;
 }
 }
 return EFalse;
 }
 //////////////////////////////////////////////////////////////////////
 // CAknNoteDialogExtension
 //////////////////////////////////////////////////////////////////////
 NONSHARABLE_CLASS(CAknNoteDialogExtension) : public CBase
 //////////////////////////////////////////////////////////////////////
 EXPORT_C CAknNoteDialog::CAknNoteDialog() : CEikDialog(),
 iTimeoutInMicroseconds(ENoTimeout), iTone(ENoTone)
 {
+_AKNTRACE_FUNC_ENTER;
 AKNTASHOOK_ADD( this, "CAknNoteDialog" );
+_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C CAknNoteDialog::CAknNoteDialog(const TTone& aTone, const TTimeout& aTimeout) :
 CEikDialog(), iTimeoutInMicroseconds(aTimeout), iTone(aTone)
 {
+_AKNTRACE_FUNC_ENTER;
+_AKNTRACE("iTimeoutInMicroseconds = %d", aTimeout);
 AKNTASHOOK_ADD( this, "CAknNoteDialog" );
+_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C CAknNoteDialog::CAknNoteDialog(CEikDialog** aSelfPtr,const TTone& aTone, const TTimeout& aTimeout) :
 CEikDialog(), iTimeoutInMicroseconds(aTimeout), iSelfPtr(aSelfPtr), iTone(aTone)
 {
+_AKNTRACE_FUNC_ENTER;
+_AKNTRACE("iTimeoutInMicroseconds = %d", aTimeout);
 AKNTASHOOK_ADD( this, "CAknNoteDialog" );
+_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C CAknNoteDialog::~CAknNoteDialog()
 {
+_AKNTRACE_FUNC_ENTER;
 AKNTASHOOK_REMOVE();
 // FIXME: Experimental heuristics for determining popup type
 #ifdef RD_UI_TRANSITION_EFFECTS_POPUPS
 if ( GfxTransEffect::IsRegistered( this ) )
 iSelfPtr = NULL;
 }
 delete iControlAttributes;
 delete iNoteExtension;
+_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknNoteDialog::SetTimeout(const TTimeout& aTimeout)
 {
 iTimeoutInMicroseconds = aTimeout;
 return EKeyWasConsumed;
 }
 EXPORT_C void CAknNoteDialog::LayoutAndDraw()
 {
+_AKNTRACE_FUNC_ENTER;
 if (IsActivated())
 {
 TRect screenRect = iAvkonAppUi->ApplicationRect();
 SetSizeAndPosition(PreferredSize( screenRect.Size()/*TSize(AKN_LAYOUT_WINDOW_screen.iW,AKN_LAYOUT_WINDOW_screen.iH)*/));
 DrawNow();
 // Tell the attributes that the note has been fully drawn.
 // Optimized text drawing is allowed only after this.
 CAknNoteAttributes* attr = ControlAttributes();
 if ( attr )
 {
-RDebug::Print(_L("CAknNoteDialog allowing opt. draw, %d"), (TUint)this );
+_AKNTRACE( "[%s][%s] allowing opt. draw,0x%x", "CAknNoteDialog", "LayoutAndDraw", this );
 attr->AllowOptimizedDrawing();
 }
 }
+_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C TInt CAknNoteDialog::RunLD()
 {
+_AKNTRACE_FUNC_ENTER;
 PlayTone();
 ReportUserActivity();
 // FIXME: Experimental heuristics for finding out popup context from image/animation
 #ifdef RD_UI_TRANSITION_EFFECTS_POPUPS
 {
 GfxTransEffect::Register( this, TUid::Uid( uid ) );
 CAknTransitionUtils::RemoveData( ( TInt )NoteControl() );
 }
 #endif
+_AKNTRACE_FUNC_EXIT;
 return CEikDialog::RunLD();
 }
 EXPORT_C TInt CAknNoteDialog::StaticDeleteL(TAny *aThis)
 {
+_AKNTRACE_FUNC_ENTER;
 CAknNoteDialog* self = REINTERPRET_CAST(CAknNoteDialog*,aThis);
 #ifdef RD_UI_TRANSITION_EFFECTS_POPUPS
 if ( self->IsVisible() && GfxTransEffect::IsRegistered( self ) &&
 IsFocusedWindowGroup( self ) )
 		{
 TBool rsWasEnabled( EFalse );
 if( !CAknEnv::Static()->TransparencyEnabled() && self->DrawableWindow() && self->Window().IsRedrawStoreEnabled() )
 {
 rsWasEnabled = ETrue;
 self->iTimer->Cancel();
 self->OkToExitL(KErrCancel);
 self->ExitSleepingDialog();
 self->NoteControl()->Reset();
 }
+_AKNTRACE_FUNC_EXIT;
 return EFalse;
 }
 EXPORT_C void CAknNoteDialog::SetSizeAndPosition( const TSize& aSize )
 {
+_AKNTRACE_FUNC_ENTER;
 SetBorder( TGulBorder::ENone );
 CAknNoteControl* note = NoteControl();
 if (note)
 {
 if (!ControlAttributes()->IsLayoutNeeded()) // if we have a note control, there must be attributes also
 AknLayoutUtils::LayoutControl(this, mainPane, dialogLay);
 }
 ControlAttributes()->SetLayoutDone();
 }
+_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknNoteDialog::PreLayoutDynInitL()
 {
 TransferControlAttributes();
 #endif
 EXPORT_C void CAknNoteDialog::HandleResourceChange(TInt aType)
 {
+_AKNTRACE_FUNC_ENTER;
 if(aType==KEikDynamicLayoutVariantSwitch)
 {
 if (!IsVisible())
 	{
 	// a invisible note dialog is assumed to be a sleeping dialog
 NoteControl()->Layout();
 }
 }
 CEikDialog::HandleResourceChange(aType);
+_AKNTRACE_FUNC_EXIT;
 }
 /**
 * Deprecated methods
 */
 //------------------------------------------------------------------------------
 //
 EXPORT_C void CAknNoteDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
+_AKNTRACE_FUNC_ENTER;
 if ( AknLayoutUtils::PenEnabled() )
 {
 CCoeControl* ctrl = GrabbingComponent();
 CCoeControl::HandlePointerEventL(aPointerEvent);
+// Add tactile feedbacup when tap can close note.
-if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
+if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
 {
-if ( DialogFlags()&EEikDialogFlagCloseDialogWhenTapped )
+if ( DialogFlags() & EEikDialogFlagCloseDialogWhenTapped )
 {
-//Touch release gives pop-up effect if note can be dismissed.
+if( Rect().Contains( aPointerEvent.iPosition ) )
+{
+MTouchFeedback* feedback = MTouchFeedback::Instance();
+if ( feedback )
+{
+feedback->InstantFeedback( ETouchFeedbackPopUp );
+}
+}
+}
+}
+else if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
+{
+if ( DialogFlags() & EEikDialogFlagCloseDialogWhenTapped )
+{
 if ( ctrl )
 {
 // if grabbingComponent and dialog has 'close dialog when
 // tapped flag', then close dialog here because tapping happened.
 if ( !IsBeingDestroyed() )
 {
 StaticDeleteL( this );
 }
-MTouchFeedback* feedback = MTouchFeedback::Instance();
-if ( feedback )
-{
-feedback->InstantFeedback( ETouchFeedbackPopUp );
-}
 }
 }
 }
 }
+_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void* CAknNoteDialog::ExtensionInterface( TUid /*aInterface*/ )
 {

branch	RCL_3
changeset 56	d48ab3b357f1
parent 55	aecbbf00d063