equal
deleted
inserted
replaced
66 { |
66 { |
67 AppUi()->RemoveFromStack( iInfoListBoxContainer ); |
67 AppUi()->RemoveFromStack( iInfoListBoxContainer ); |
68 delete iInfoListBoxContainer; |
68 delete iInfoListBoxContainer; |
69 } |
69 } |
70 } |
70 } |
71 |
|
72 |
|
73 if( iCaptureSetupControlHandler ) |
|
74 { |
|
75 delete iCaptureSetupControlHandler; |
|
76 } |
|
77 PRINT( _L("Camera <= ~CCamCaptureSetupViewBase") ); |
71 PRINT( _L("Camera <= ~CCamCaptureSetupViewBase") ); |
78 } |
72 } |
79 |
73 |
80 // ----------------------------------------------------------------------------- |
74 // ----------------------------------------------------------------------------- |
81 // CCamCaptureSetupViewBase::HandleCommandL |
75 // CCamCaptureSetupViewBase::HandleCommandL |
557 // Cleanup the view correctly if a leave occurs |
551 // Cleanup the view correctly if a leave occurs |
558 CleanupStack::PushL( TCleanupItem( CleanupCaptureSetupContainer, this ) ); |
552 CleanupStack::PushL( TCleanupItem( CleanupCaptureSetupContainer, this ) ); |
559 CCamAppUiBase* appUi = static_cast<CCamAppUiBase*>( AppUi() ); |
553 CCamAppUiBase* appUi = static_cast<CCamAppUiBase*>( AppUi() ); |
560 |
554 |
561 TRect rect = appUi->ApplicationRect(); |
555 TRect rect = appUi->ApplicationRect(); |
562 if ( !AknLayoutUtils::PenEnabled() ) |
556 if ( !CamUtility::IsNhdDevice() ) |
563 { |
557 { |
564 // Space for visible statuspane for non-touch device |
558 // Space for visible statuspane for non-touch device |
565 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect ); |
559 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect ); |
566 } |
560 } |
567 iCaptureSetupContainer = CCamCaptureSetupContainer::NewL( iController, |
561 iCaptureSetupContainer = CCamCaptureSetupContainer::NewL( iController, |