--- a/ui/views/fullscreenview/src/glxfullscreenview.cpp Mon May 03 12:31:32 2010 +0300
+++ b/ui/views/fullscreenview/src/glxfullscreenview.cpp Fri May 14 15:52:22 2010 +0300
@@ -263,7 +263,6 @@
if(mFullScreenToolBar) {
mFullScreenToolBar->clearActions();
- delete mFullScreenToolBar;
mFullScreenToolBar = NULL;
}
@@ -291,6 +290,7 @@
OstTraceExt2( TRACE_NORMAL, GLXFULLSCREENVIEW_SETMODEL, "GlxFullScreenView::setModel; model=%x; mModel=%u", ( TUint )( model ), ( TUint ) mModel );
mModel = model;
+ setModelContext();
setHdmiModel(mModel);
mCoverFlow->setModel(mModel);
@@ -712,25 +712,6 @@
OstTraceFunctionExit0( DUP1_GLXFULLSCREENVIEW_GLXFULLSCREENVIEW_EXIT );
}
-void GlxFullScreenView::handleUserAction(qint32 commandId)
-{
- OstTraceFunctionEntry0( GLXFULLSCREENVIEW_HANDLEUSERACTION_ENTRY );
-
- switch( commandId ) {
- case EGlxCmdRotate :
- //trigger the rotate Effect in CoverFlow
- mCoverFlow->rotateImage();
- break;
-
-
-
- default :
- break;
- }
-
- OstTraceFunctionExit0( GLXFULLSCREENVIEW_HANDLEUSERACTION_EXIT );
-}
-
void GlxFullScreenView::imageSelectionAnimation(const QModelIndex &index)
{
OstTraceFunctionEntry0( GLXFULLSCREENVIEW_IMAGESELECTIONANIMATION_ENTRY );
@@ -778,3 +759,20 @@
}
return substate;
}
+
+bool GlxFullScreenView::event(QEvent *event)
+{
+ GLX_LOG_INFO1("GlxFullScreenView::event() %d event type", event->type());
+ if ( event->type() == QEvent::WindowActivate && mCoverFlow) {
+ if (mTvOutWrapper){
+ mTvOutWrapper->setToNativeMode();
+ }
+ }
+ if ( event->type() == QEvent::WindowDeactivate && mCoverFlow) {
+ if (mTvOutWrapper){
+ mTvOutWrapper->setToCloningMode();
+ }
+ }
+ return HbView::event(event);
+}
+