MCL/sf/app/photos: comparison photosgallery/viewframework/views/fullscreenview/src/glxfullscreenviewimp.cpp

equal deleted inserted replaced

-:191387a8b767
+:a60acebbbd9d
 //11 = (5(5 fullscreen texture backwards)+1(fucus index texture)+5(5 fullscreen texture forwards))
 const TInt KFullScreenTextureOffset = 5;
 const TInt KGlxDecodingThreshold = 3000000; // pixels
 _LIT( KTfxResourceActivateFullScreen, "z:\\resource\\effects\\photos_fullscreen_open.fxml" );
+_LIT( KTfxResourceNoEffect, "");
 // ======== MEMBER FUNCTIONS ========
 // ---------------------------------------------------------------------------
 // C++ default constructor can NOT contain any code, that
 	iTimer = CPeriodic::NewL( CActive::EPriorityStandard );
 	//Register the view to recieve toolbar events. ViewBase handles the events
 	SetToolbarObserver(this);
 	iImgViewerMode = EFalse;
 //Disable the toolbar always while entering fullscreen
-	EnableFSToolbarL(EFalse);
+	EnableFSToolbar(EFalse);
 ShowToolbarOnViewActivation(EFalse);
 	//Get the ScreenFurniture instance
 	iScreenFurniture = iUiUtility->ScreenFurniture();
 //Get the env from the uiutilities
 	iEnv = iUiUtility->Env ();
 	iZoomButtonGroup = CEikButtonGroupContainer::NewL(
 	        CEikButtonGroupContainer::ECba,  // type
 	        CEikButtonGroupContainer::EHorizontal,  // orientation
 	        this,  // command observer
 	        R_GLX_FULLSCREEN_SOFTKEYS_ZOOM );
 // ---------------------------------------------------------------------------
 //
 CGlxFullScreenViewImp::~CGlxFullScreenViewImp()
 {
 TRACER("CGlxFullScreenViewImp::~CGlxFullScreenViewImp");
+if(iAlfEffectObs)
+{
+delete iAlfEffectObs;
+}
 delete iMMCNotifier;
 iMMCNotifier = NULL;
 	delete iMediaListMulModelProvider;
 if(iTimer->IsActive())
 void CGlxFullScreenViewImp::DoMLViewActivateL(
 		const TVwsViewId & /* aPrevViewId */, TUid /* aCustomMessageId */,
 		const TDesC8 & /* aCustomMessage */)
 	{
 TRACER("CGlxFullScreenViewImp::DoMLViewActivateL");
-	//Disable the softkeys
-Cba()->MakeVisible( EFalse );
-Cba()->DrawNow();
 // hide the toolbar
-EnableFSToolbarL(EFalse);
+EnableFSToolbar(EFalse);
 CGlxNavigationalState* navigationalState =  CGlxNavigationalState::InstanceL();
 CleanupClosePushL( *navigationalState );
 CMPXCollectionPath* naviState = navigationalState->StateLC();
 if(!iMediaList->Count())
 SetItemToHDMIL();
 }
 iScreenFurniture->SetActiveView(iViewUid);
 //set the ui state to off,when the Fullscreen launches
-SetUiSate(NGlxNFullScreenUIState::EUiOff);
+SetUiState(EUiOff);
 	GlxSetAppState::SetState(EGlxInFullScreenView);
 // create the coverflow
 CreateCoverflowWidgetL();
 	//UI Screen furnitures are disabled by default while going to fullscreen.
 	//Check if the transitions are enabled from themes
 if (CAknTransitionUtils::TransitionsEnabled(
 AknTransEffect::EFullScreenTransitionsOff))
 {
+if(!iAlfEffectObs)
+{
+iAlfEffectObs = CAlfEffectObserver::NewL();
+}
 const_cast<CAlfLayout&> (iCoverFlowWidget->ContainerLayout()).SetEffectL(
 KTfxResourceActivateFullScreen);
+iEffectHandle = iCoverFlowWidget->ContainerLayout().Identifier();
+iAlfEffectObs->SubscribeCallbackL(this,iEffectHandle);
 }
 	//Disable the status pane here as it causes flicker while animating
 CAknViewAppUi* appui = AppUi();
 if ( appui )
 //Since the toolbar should not be present for ImageViewer.
 if(!iImgViewerMode)
 {
 //show the toolbar
-EnableFSToolbarL(ETrue);
+EnableFSToolbar(ETrue);
 }
 // For floating toolbar in non-touch devices
 iScreenFurniture->SetToolbarVisibility(ETrue);
 //show the softkeys
-Cba()->MakeVisible( ETrue );
+CEikButtonGroupContainer* cba = Cba();
-Cba()->DrawNow();
+cba->SetCommandSetL( R_GLX_FULLSCREEN_SOFTKEYS );
+cba->MakeVisible( ETrue );
+cba->DrawNow();
 //set the ui state to On
-SetUiSate(NGlxNFullScreenUIState::EUiOn);
+SetUiState(EUiOn);
 //start the timer,for the screen timeout
 iTimer->Cancel();
 if(aStartTimer)
 {
 // ---------------------------------------------------------------------------
 // HideUi
 // ---------------------------------------------------------------------------
 //
-void  CGlxFullScreenViewImp::HideUi(TBool aSliderStatus)
+void  CGlxFullScreenViewImp::HideUi(TBool aHideSlider)
 {
 TRACER("CGlxFullScreenViewImp::HideUi");
 //cancel the timer
 iTimer->Cancel();
 // For floating toolbar in non-touch devices
 iScreenFurniture->SetToolbarVisibility(EFalse);
-// hide the slider
-if(aSliderStatus && iSliderWidget)
+// hide/show the slider
-{
+if(iSliderWidget)
-	    iSliderWidget->ShowWidget(EFalse);
+{
-		}
+iSliderWidget->ShowWidget(!aHideSlider);
+}
 if (iCoverFlowWidget)
 {
 iCoverFlowWidget->SetUIMode(EFalse);
 }
 // hide the softkeys
 Cba()->MakeVisible( EFalse );
 Cba()->DrawNow();
 // set the ui state to On
-SetUiSate(NGlxNFullScreenUIState::EUiOff);
+SetUiState(EUiOff);
 }
 // ---------------------------------------------------------------------------
-// SetUiSate
+// SetUiState
 // ---------------------------------------------------------------------------
 //
-void CGlxFullScreenViewImp::SetUiSate (NGlxNFullScreenUIState::TUiState  aState)
+void CGlxFullScreenViewImp::SetUiState (TUiState  aState)
 {
-TRACER("CGlxFullScreenViewImp::SetUiSate");
+TRACER("CGlxFullScreenViewImp::SetUiState");
 iUiState = aState;
 }
 // ---------------------------------------------------------------------------
-// GetUiSate
+// GetUiState
 // ---------------------------------------------------------------------------
 //
-NGlxNFullScreenUIState::TUiState CGlxFullScreenViewImp::GetUiSate()
+TUiState CGlxFullScreenViewImp::GetUiState()
 {
-TRACER("CGlxFullScreenViewImp::GetUiSate");
+TRACER("CGlxFullScreenViewImp::GetUiState");
 return iUiState;
 }
 // ---------------------------------------------------------------------------
 // TimeOut
 if(aSelf)
 {
 CGlxFullScreenViewImp* self = static_cast <CGlxFullScreenViewImp*> (aSelf);
 if (self)
 {
-if ( NGlxNFullScreenUIState::EUiOn == self->GetUiSate())
+if ( EUiOn == self->GetUiState())
 {
 // After time out, hide UI only when menu is not being displayed.
 if( self->MenuBar() && !(self->MenuBar()->IsDisplayed()) )
 {
 		            self->HideUi(ETrue);
 iCoverFlowWidget->ShowWidget(EFalse);
 }
 if(iSliderWidget)
 {
 iSliderWidget->RemoveEventHandler(*this);
-}
-//Dont Hide the slider,when activating the Zoom control,so pass EFalse
+//show/hide the slider based on the return value of
-HideUi(EFalse);
+//IsHidden()
+	    if(iZoomControl->Activated())
+	        {
+	        HideUi(iSliderWidget->IsHidden());
+	        }
+		}
 iViewWidget->show(ETrue);
 }
 // ---------------------------------------------------------------------------
 //ActivateFullScreen function.
 iCoverFlowWidget->AddEventHandler(*this);
 iCoverFlowWidget->ShowWidget(ETrue);
 }
 if(iSliderWidget)
 {
-iSliderWidget->ShowWidget( EFalse );
 iSliderWidget->AddEventHandler(*this);
 }
 iViewWidget->show(ETrue);
 iViewWidget->setRect(TRect(TPoint(0,0),AlfUtil::ScreenSize()));
 	GlxSetAppState::SetState(EGlxInFullScreenView);
 }
 if(iZoomControl->Activated())
 {
 iZoomControl->Deactivate();
 }
-//Once into fullscreen view,show the screen furniture
-HideUi(ETrue);
+//check if the slider is already visible in zoom view.
+//if yes then do not disable the slider.
+TBool sliderInvisible = ETrue;
+if (EUiOn == iZoomControl->ZoomUiState())
+{
+sliderInvisible = EFalse;
+}
+HideUi(sliderInvisible);
+if (!sliderInvisible)
+{
+//Set the UI State to On Explicitly since the slider is ON and we have
+//to disable on timeout. The timer is already cancelled in HideUi().
+SetUiState(EUiOn);
+iTimer->Start(KGlxScreenTimeout,KGlxScreenTimeout,TCallBack( TimeOut,this ));
+}
 }
 // ---------------------------------------------------------------------------
 // From CAknView
 // View deactivation function.
 	//Disabling the toolbar here since it would give a crash when
 	//we try to enable the toolbar in activate without exiting photos.
 if(!iImgViewerMode)
 {
 // hide the toolbar
-TRAP_IGNORE(EnableFSToolbarL(EFalse));
+EnableFSToolbar(EFalse);
+//Setting Soft key to EmptySoftKeys would cause crash
+		//When Fullscreen is opened from ImageViewer.
+//So Set Soft Keys to empty only when not in Image Viewer mode.
+		CEikButtonGroupContainer* cba = Cba();
+		TRAP_IGNORE( cba->SetCommandSetL( R_GLX_FULLSCREEN_EMPTYSOFTKEYS ) );
+		cba->DrawNow();
 }
 HideUi(ETrue);
 	// In Order to hide the softkeys immediately. The above statement does not do that as soon as we need.
 	// So we do the below trick. The SK overlap is still there but much much less noticable.
 //EKeyApplicationC for which TStdScancode is EStdKeyApplicatoinC
 case EStdKeyApplicationC:
 {
 if(EEventKeyDown == aEvent.Code())
 {
-//Dont start the timer while activating the zoom control,
+HideUi(EFalse);
-//when the timer activates while launching the zoom
-//it causes the crash.
-ShowUiL(EFalse);
 TRAP_IGNORE( ActivateZoomControlL(EZoomStartKey));
 return EEventConsumed;
 }
 }
 case EStdKeyUpArrow:
 case EStdKeyDevice1:
 //Listen EStdKeyApplicationC as EKeyZoomOut key is mapped to TKeyCode::
 //EKeyApplicationD for which TStdScancode is EStdKeyApplicatoinD
 case EStdKeyApplicationD:
 {
-if ( NGlxNFullScreenUIState::EUiOff == GetUiSate()&& (
+if ( EUiOff == GetUiState()&& (
 aEvent.Code() == EEventKey ) )
 {
 //the Ui timer should be started once the UI screen furniture is shown
 ShowUiL(ETrue);
 }
 return EEventHandled;
 }
 case EStdKeyLeftArrow:
 case EStdKeyRightArrow:
 {
-if ( NGlxNFullScreenUIState::EUiOn == GetUiSate() )
+if ( EUiOn == GetUiState() )
 {
 HideUi(ETrue);
 }
 return EEventHandled;
 }
 case ETypeSelect:
 {
 TBool pensupport = iUiUtility->IsPenSupported();
 if ( pensupport )
 {
-if ( NGlxNFullScreenUIState::EUiOn == GetUiSate() )
+if ( EUiOn == GetUiState() )
 {
 //Hide the slider
 HideUi(ETrue);
 }
 else
 ShowUiL(ETrue);
 }
 }
 else
 {
-if ( NGlxNFullScreenUIState::EUiOff == GetUiSate() )
+if ( EUiOff == GetUiState() )
 {
 //the Ui timer should be started once the UI screen furniture is shown
 ShowUiL(ETrue);
 }
 }
 return EEventConsumed;
 }
 case ETypeItemRemoved:
 {
 SetItemToHDMIL();
+TInt focusIndex = iMediaList->FocusIndex();
+if (focusIndex != KErrNotFound
+&& EUiOn == GetUiState()
+&& iMediaList->Item(focusIndex).Category()
+== EMPXVideo)
+{
+// hide the slider
+if (iSliderWidget)
+{
+iSliderWidget->ShowWidget(EFalse);
+}
+}
 return EEventConsumed;
 }
 case ETypeHighlight:
 {
 iMediaList->SetFocusL( NGlxListDefs::EAbsolute,(aEvent.CustomEventData()));
 if(iMediaList->Count()> KFullScreenTextureOffset)
 {
 RemoveTexture();
 }
 SetItemToHDMIL();
-if ( NGlxNFullScreenUIState::EUiOn == GetUiSate() )
+if ( EUiOn == GetUiState() )
 {
 HideUi(ETrue);
 }
 TRAP_IGNORE(ShowDrmExpiryNoteL());
 return EEventConsumed;
 {
 ProcessCommandL(EGlxCmdPlay);
 }
 else
 {
-if ( NGlxNFullScreenUIState::EUiOn == GetUiSate() )
+if ( EUiOn == GetUiState() )
 {
 HideUi(ETrue);
 }
 else
 {
 CleanupStack::PopAndDestroy(naviState);
 CleanupStack::PopAndDestroy(navigationalState);
 }
 // ---------------------------------------------------------------------------
-// HandleMMCInsertionL
+// HandleMMCRemovalL
 //
 // ---------------------------------------------------------------------------
 void CGlxFullScreenViewImp::HandleMMCRemovalL()
 {
 TRACER("CGlxFullScreenViewImp::HandleMMCRemovalL()");
 ProcessCommandL(EAknSoftkeyExit);
 }
 }
 // ---------------------------------------------------------------------------
-// EnableFSToolbarL
+// EnableFSToolbar
-//
+// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
+//
-//
+void CGlxFullScreenViewImp::EnableFSToolbar(TBool aEnable)
-void CGlxFullScreenViewImp::EnableFSToolbarL(TBool aEnable)
+{
-{
+	TRACER("CGlxFullScreenViewImp::EnableFSToolbar()");
-	TRACER("CGlxFullScreenViewImp::EnableFSToolbarL()");
 CAknToolbar* toolbar = Toolbar();
 if(toolbar)
 {
-toolbar->DisableToolbarL(!aEnable);
+TRAP_IGNORE(toolbar->DisableToolbarL(!aEnable));
 toolbar->SetToolbarVisibility(aEnable);
 }
 }
+// ---------------------------------------------------------------------------
+// HandleEffectCallback
+//
+// ---------------------------------------------------------------------------
+//
+void CGlxFullScreenViewImp::HandleEffectCallback(TInt aType, TInt aHandle,
+TInt /*aStatus*/)
+{
+TRACER("CGlxFullScreenViewImp::HandleEffectCallback()");
+if (aHandle == iEffectHandle && aType == EAlfEffectComplete)
+{
+TRAP_IGNORE(const_cast<CAlfLayout&>
+(iCoverFlowWidget->ContainerLayout()).SetEffectL(
+KTfxResourceNoEffect));
+}
+}

branch	RCL_3
changeset 17	a60acebbbd9d
parent 15	191387a8b767
child 18	78ad99c24f08