equal
deleted
inserted
replaced
1979 && !seqCapturing |
1979 && !seqCapturing |
1980 ) |
1980 ) |
1981 { |
1981 { |
1982 // Draw the resolution indicator |
1982 // Draw the resolution indicator |
1983 if ( appUi->ActiveCamera() == ECamActiveCameraPrimary |
1983 if ( appUi->ActiveCamera() == ECamActiveCameraPrimary |
1984 && ( AknLayoutUtils::PenEnabled() |
1984 && ( CamUtility::IsNhdDevice() |
1985 || videoOperation == ECamNoOperation ) ) |
1985 || videoOperation == ECamNoOperation ) ) |
1986 { |
1986 { |
1987 iResolutionIndicators[iCurrentIndicator]->Draw( aGc ); |
1987 iResolutionIndicators[iCurrentIndicator]->Draw( aGc ); |
1988 } |
1988 } |
1989 |
1989 |
2631 void CCamPreCaptureContainerBase::SizeChanged() |
2631 void CCamPreCaptureContainerBase::SizeChanged() |
2632 { |
2632 { |
2633 if ( iController.UiConfigManagerPtr() && |
2633 if ( iController.UiConfigManagerPtr() && |
2634 iController.UiConfigManagerPtr()->IsAutoFocusSupported() ) |
2634 iController.UiConfigManagerPtr()->IsAutoFocusSupported() ) |
2635 { |
2635 { |
2636 if ( AknLayoutUtils::PenEnabled() ) |
2636 if ( CamUtility::IsNhdDevice() ) |
2637 { |
2637 { |
2638 TouchLayout(); |
2638 TouchLayout(); |
2639 } |
2639 } |
2640 else |
2640 else |
2641 { |
2641 { |
2736 TRect CCamPreCaptureContainerBase::ResolutionIndicatorRect() const |
2736 TRect CCamPreCaptureContainerBase::ResolutionIndicatorRect() const |
2737 { |
2737 { |
2738 CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() ); |
2738 CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() ); |
2739 TAknLayoutRect resolutionIconLayout; |
2739 TAknLayoutRect resolutionIconLayout; |
2740 TAknLayoutRect indicatorPane; |
2740 TAknLayoutRect indicatorPane; |
2741 if ( AknLayoutUtils::PenEnabled() ) |
2741 if ( CamUtility::IsNhdDevice() ) |
2742 { |
2742 { |
2743 TInt variant = Layout_Meta_Data::IsLandscapeOrientation(); |
2743 TInt variant = Layout_Meta_Data::IsLandscapeOrientation(); |
2744 if ( appUi->TargetMode() == ECamControllerVideo ) |
2744 if ( appUi->TargetMode() == ECamControllerVideo ) |
2745 { |
2745 { |
2746 TRect rect; |
2746 TRect rect; |
2934 { |
2934 { |
2935 iIndBlinkTimer->Cancel(); |
2935 iIndBlinkTimer->Cancel(); |
2936 iDrawIndicator = ETrue; |
2936 iDrawIndicator = ETrue; |
2937 } |
2937 } |
2938 |
2938 |
2939 CCamAppUi* appUi = static_cast<CCamAppUi*>( iEikonEnv->AppUi() ); |
2939 if ( iCaptureButtonContainer ) |
2940 if ( iCaptureButtonContainer && !( appUi && appUi->SelfTimerEnabled() ) ) |
|
2941 { |
2940 { |
2942 iCaptureButtonContainer->SetCaptureButtonShown( EFalse ); |
2941 iCaptureButtonContainer->SetCaptureButtonShown( EFalse ); |
2943 } |
2942 } |
2944 } |
2943 } |
2945 // End of File |
2944 // End of File |