FCL/sf/app/homescreen: comparison taskswitcher/taskswitcherui/taskswitcherapp/src/tsappui.cpp

equal deleted inserted replaced

-:c743ef5928ba
+:f966699dea19
 #include <akntitle.h>
 #include <hlplch.h>
 #include <avkon.rsg>
 #include <bautils.h>
 #include <AknUtils.h>
-#include <tstaskswitcher.rsg>
+#include <taskswitcher.rsg>
 #include <pslninternalcrkeys.h>
 #include <oommonitorsession.h>
 #include <hal.h>
 #include <hal_data.h>
 #include <akntranseffect.h>
+#include <UikonInternalPSKeys.h>
 // AknCapServer UID, used for P&S category
 const TUid KTaskswitcherStateCategory = { 0x10207218 };
 // Taskswitcher UI, used as P&S key
 const TInt KTaskswitcherStateKey = KTsAppUidValue;
+const TUid KTransitionsUid = {0x10281F90};
 // Values for Taskswitcher launching P&S
 const TInt KTaskswitcherBackgroundValue = 1;
 const TInt KTaskswitcherForegroundValue = KTaskswitcherBackgroundValue << 1;
 const TInt KTaskswitcherShortAppKeyPressed = KTaskswitcherForegroundValue << 1;
 		fs.Close();
 		}
 #endif
 // Initialise app UI with standard value.
-BaseConstructL( CAknAppUi::EAknEnableSkin | CAknAppUi::EAknEnableMSK );
+BaseConstructL( CAknAppUi::EAknEnableSkin |
+					CAknAppUi::EAknEnableMSK |
+					CAknAppUi::EAknSingleClickCompatible);
+SetFullScreenApp(EFalse);
 #ifndef _DEBUG
 // set as system application (in release build) so we never get closed
 iEikonEnv->SetSystem( ETrue );
 #endif
 iGoToBackgroundTimer = CPeriodic::NewL( CActive::EPriorityStandard );
 // Create commonly used instances (device state only?)
 iDeviceState = CTsDeviceState::NewL();
+// Create custom window group
+iWg = RWindowGroup(CCoeEnv::Static()->WsSession());
+iWg.Construct((TUint32)&iWg, ETrue);
 // Create UI
-iAppView = CTsAppView::NewL( ApplicationRect(), *iDeviceState );
+iAppView = CTsAppView::NewL( ApplicationRect(), *iDeviceState, iWg );
 AddToStackL( iAppView );
 //Enable effects
 GfxTransEffect::Enable();
-GfxTransEffect::Register(iAppView,TUid::Uid(KTsAppUidValue));
+GfxTransEffect::Register(iAppView,KTransitionsUid);
 GfxTransEffect::SetTransitionObserver(this);
 // Listen for change in the value of the ts state property.
 iPropListener = new ( ELeave ) CTsPropertyListener(
 KTaskswitcherStateCategory, KTaskswitcherStateKey, *this );
+// Listen for layout changes
+iLayoutListener = new ( ELeave ) CTsPropertyListener(
+KPSUidUikon, KUikLayoutState, *this );
 // Initialise the application task object with the window group id of
 // our application ( so that it represent our app )
-iApplicationTask.SetWgId( iCoeEnv->RootWin().Identifier() );
+//iApplicationTask.SetWgId( iCoeEnv->RootWin().Identifier() );
+iApplicationTask.SetWgId( iWg.Identifier() );
 // And finally, go to background.
-MoveAppToBackground( AknTransEffect::ENone );
+MoveAppToBackground( ENoneTransition );
+iEikonEnv->RootWin().SetOrdinalPosition(-1);
+iEikonEnv->RootWin().EnableReceiptOfFocus(EFalse);
+iIsPopUpShown = EFalse;
 TSLOG_OUT();
 }
 // -----------------------------------------------------------------------------
 // CTsAppUi::CTsAppUi()
 }
 GfxTransEffect::SetTransitionObserver(0);
 delete iGoToBackgroundTimer;
 delete iPropListener;
+delete iLayoutListener;
 // destroy UI first
 if ( iAppView )
 {
 RemoveFromStack( iAppView );
 }
 delete iDeviceState;
 delete iMemAllocBuf;
 delete iThemeEffectsEnabledWatcher;
+iWg.Close();
 }
 // -----------------------------------------------------------------------------
 // CTsAppView::EffectsEnabled
 // -----------------------------------------------------------------------------
 {
 return;
 }
 switch(aTransitionType)
 {
-case AknTransEffect::EApplicationStart:
+case EForegroundTransition:
 StartTransition( aTransitionType,
 ETrue,
 EFalse,
 CAknTransitionUtils::EForceVisible);
 break;
-case AknTransEffect::EApplicationExit:
+case EBackgroundTransition:
 StartTransition( aTransitionType,
 EFalse,
 EFalse,
 CAknTransitionUtils::EForceInvisible );
 break;
-case AknTransEffect::EApplicationStartRect:
+case EActivationTransition:
 StartTransition( aTransitionType,
 EFalse,
 ETrue,
 CAknTransitionUtils::EForceInvisible );
 break;
 void CTsAppUi::StartTransition( TUint aTranstionId,
 TBool aVisibility,
 TBool /*aLayers*/,
 TUint aSubCom )
 {
+this->RequestPopUpL();
 const TDesC8* ptr = reinterpret_cast<const TDesC8*>(iAppView);
 GfxTransEffect::Abort(iAppView);
 GfxTransEffect::Begin( iAppView, aTranstionId );
 GfxTransEffect::SetDemarcation( iAppView, iAppView->Rect() );
 GfxTransEffect::NotifyExternalState( ECaptureComponentsBegin, ptr );
 // -----------------------------------------------------------------------------
 //
 void CTsAppUi::TransitionFinished(const CCoeControl* /*aControl*/,
 TUint /*aAction*/)
 {
+DisablePopUpL();
 /*if( aControl == iAppView )
 {
 		@TODO IMPLEMENT
 }*/
 }
 break;
 case EAknSoftkeyExit:
 case EAknSoftkeyBack:
 // RSK => just hide
-MoveAppToBackground( AknTransEffect::EApplicationExit );
+MoveAppToBackground( EBackgroundTransition );
 break;
 case ETsCmdHelp:
 {
-MoveAppToBackground( AknTransEffect::EApplicationExit );
+MoveAppToBackground( EBackgroundTransition );
 CArrayFix<TCoeHelpContext>* buf = CCoeAppUi::AppHelpContextL();
 HlpLauncher::LaunchHelpApplicationL( iCoeEnv->WsSession(), buf );
 }
 break;
 // not with the hw key but by other means etc.)
 if ( aForeground )
 {
 HandleSwitchToForegroundEvent();
 }
-else
+// exclude cases with dialogs like power menu, memory card
+else if( !IsFaded())
 {
 HandleSwitchToBackgroundEvent();
 }
 // Call Base class method
 TSLOG_CONTEXT( PropertyChanged, TSLOG_LOCAL );
 TSLOG_IN();
 TInt value( 0 );
-if ( RProperty::Get( aCategory, aKey, value ) == KErrNone )
+if ( aCategory == KTaskswitcherStateCategory )
 {
-if ( iForeground && (value & KTaskswitcherBackgroundValue) )
+if ( RProperty::Get( aCategory, aKey, value ) == KErrNone )
 {
-MoveAppToBackground( AknTransEffect::EApplicationExit );
+if ( iForeground && (value & KTaskswitcherBackgroundValue) )
-}
-else if ( !iForeground && (value & KTaskswitcherForegroundValue) )
-{
-MoveAppToForeground( AknTransEffect::EApplicationStart );
-}
-else if( value & KTaskswitcherLongAppKeyPressed )
-{
-if(!iForeground)
 {
-MoveAppToBackground( AknTransEffect::EApplicationExit );
+MoveAppToBackground( EBackgroundTransition );
 }
-else
+else if ( !iForeground && (value & KTaskswitcherForegroundValue) )
 {
-iAppView->HandleAppKey(KAppKeyTypeLong);
+MoveAppToForeground( EForegroundTransition );
 }
-}
+else if( value & KTaskswitcherLongAppKeyPressed )
-else if(  value & KTaskswitcherShortAppKeyPressed )
+{
-{
+if(!iForeground)
-iAppView->HandleAppKey(KAppKeyTypeShort);
+{
-}
+MoveAppToBackground( EBackgroundTransition );
+}
+else
+{
+iAppView->HandleAppKey(KAppKeyTypeLong);
+}
+}
+else if(  value & KTaskswitcherShortAppKeyPressed )
+{
+iAppView->HandleAppKey(KAppKeyTypeShort);
+}
+}
+}
+else if ( aCategory == KPSUidUikon && iIsPopUpShown )
+{
+TRAP_IGNORE(
+DisablePopUpL();
+HandleResourceChangeL(KEikDynamicLayoutVariantSwitch) );
 }
 TSLOG_OUT();
 }
 // CTsAppUi::HandleResourceChangeL
 // -----------------------------------------------------------------------------
 //
 void CTsAppUi::HandleResourceChangeL( TInt aType )
 {
+TSLOG_CONTEXT( CTsAppUi::HandleResourceChangeL, TSLOG_LOCAL );
+TSLOG_IN();
 // Must call base class implementation first,
 // sizes from LayoutMetricsRect etc. will only be correct after this.
 CAknAppUi::HandleResourceChangeL( aType );
 if( aType == KEikDynamicLayoutVariantSwitch && iAppView )
 {
-iAppView->SetRect( ApplicationRect() );
+// Check if layout switch is necessary
+TSizeMode mode = iEikonEnv->ScreenDevice()->GetCurrentScreenModeAttributes();
+TBool isLandscape = mode.iScreenSize.iWidth > mode.iScreenSize.iHeight;
+TRect appRect = ApplicationRect();
+TBool isAppLandscape = appRect.Width() > appRect.Height();
+if(isLandscape != isAppLandscape)
+{
+// Keep displayed orientation
+return;
+}
 }
 // forward event
 iDeviceState->HandleResourceChange( aType );
 if ( iAppView )
 {
 iAppView->HandleResourceChange( aType );
 }
+TSLOG_OUT();
 }
 // -----------------------------------------------------------------------------
 // CTsAppUi::MoveAppToBackground()
 // -----------------------------------------------------------------------------
 void CTsAppUi::MoveAppToBackground( TUint aTransitionType )
 {
 TSLOG_CONTEXT( MoveAppToBackground, TSLOG_LOCAL );
 TSLOG_IN();
-if ( AknTransEffect::ENone == aTransitionType || !EffectsEnabled() )
+if ( ENoneTransition == aTransitionType || !EffectsEnabled() )
 {
 GoToBackgroundTimerCallback( this );
 }
 else
 {
-StartTransion(AknTransEffect::EApplicationExit);
+StartTransion(aTransitionType);
 iGoToBackgroundTimer->Cancel();
 iGoToBackgroundTimer->Start(
 KWaitBeforeGoingToBackground,
 0,
 TCallBack( GoToBackgroundTimerCallback, this ) );
 {
 TSLOG_CONTEXT( HandleSwitchToBackgroundEvent, TSLOG_LOCAL );
 TSLOG_IN();
 // must not do anything if iForeground is already up-to-date
-// exclude cases with dialogs like power menu, memory card
-if( iForeground && !IsFaded() )
+if( iForeground  )
 {
 iForeground = EFalse;
 SetTaskswitcherStateProperty( KTaskswitcherBackgroundValue );
 //allocating extra memory space
 }
 TSLOG_OUT();
 }
+// -----------------------------------------------------------------------------
+// CTsAppUi::RequestPopUpL
+// -----------------------------------------------------------------------------
+//
+void CTsAppUi::RequestPopUpL()
+{
+TSLOG_CONTEXT( CTsAppUi::RequestPopUpL, TSLOG_LOCAL );
+TSLOG_IN();
+if(!iIsPopUpShown)
+{
+iIsPopUpShown = ETrue;
+TSizeMode mode = iEikonEnv->ScreenDevice()->GetCurrentScreenModeAttributes();
+TInt isLandscape = mode.iScreenSize.iWidth > mode.iScreenSize.iHeight;
+SetFullScreenApp(ETrue);
+if(isLandscape)
+{
+SetOrientationL(EAppUiOrientationLandscape);
+}
+else
+{
+SetOrientationL(EAppUiOrientationPortrait);
+}
+iEikonEnv->RootWin().SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront);
+}
+TSLOG_OUT();
+}
+// -----------------------------------------------------------------------------
+// CTsAppUi::DisablePopUpL
+// -----------------------------------------------------------------------------
+//
+void CTsAppUi::DisablePopUpL()
+{
+TSLOG_CONTEXT( CTsAppUi::DisablePopUpL, TSLOG_LOCAL );
+TSLOG_IN();
+if(iIsPopUpShown)
+{
+iIsPopUpShown = EFalse;
+iEikonEnv->RootWin().SetOrdinalPosition(-1, ECoeWinPriorityNeverAtFront);
+SetOrientationL(EAppUiOrientationAutomatic);
+SetFullScreenApp(EFalse);
+}
+TSLOG_OUT();
+}
 // End of file

branch	RCL_3
changeset 9	f966699dea19
parent 5	c743ef5928ba
child 15	ff572dfe6d86