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 && ( CamUtility::IsNhdDevice() |
1984 && ( AknLayoutUtils::PenEnabled() |
1985 || videoOperation == ECamNoOperation ) ) |
1985 || videoOperation == ECamNoOperation ) ) |
1986 { |
1986 { |
1987 iResolutionIndicators[iCurrentIndicator]->Draw( aGc ); |
1987 iResolutionIndicators[iCurrentIndicator]->Draw( aGc ); |
1988 } |
1988 } |
1989 |
1989 |
2624 void CCamPreCaptureContainerBase::SizeChanged() |
2624 void CCamPreCaptureContainerBase::SizeChanged() |
2625 { |
2625 { |
2626 if ( iController.UiConfigManagerPtr() && |
2626 if ( iController.UiConfigManagerPtr() && |
2627 iController.UiConfigManagerPtr()->IsAutoFocusSupported() ) |
2627 iController.UiConfigManagerPtr()->IsAutoFocusSupported() ) |
2628 { |
2628 { |
2629 if ( CamUtility::IsNhdDevice() ) |
2629 if ( AknLayoutUtils::PenEnabled() ) |
2630 { |
2630 { |
2631 TouchLayout(); |
2631 TouchLayout(); |
2632 } |
2632 } |
2633 else |
2633 else |
2634 { |
2634 { |
2729 TRect CCamPreCaptureContainerBase::ResolutionIndicatorRect() const |
2729 TRect CCamPreCaptureContainerBase::ResolutionIndicatorRect() const |
2730 { |
2730 { |
2731 CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() ); |
2731 CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() ); |
2732 TAknLayoutRect resolutionIconLayout; |
2732 TAknLayoutRect resolutionIconLayout; |
2733 TAknLayoutRect indicatorPane; |
2733 TAknLayoutRect indicatorPane; |
2734 if ( CamUtility::IsNhdDevice() ) |
2734 if ( AknLayoutUtils::PenEnabled() ) |
2735 { |
2735 { |
2736 TInt variant = Layout_Meta_Data::IsLandscapeOrientation(); |
2736 TInt variant = Layout_Meta_Data::IsLandscapeOrientation(); |
2737 if ( appUi->TargetMode() == ECamControllerVideo ) |
2737 if ( appUi->TargetMode() == ECamControllerVideo ) |
2738 { |
2738 { |
2739 TRect rect; |
2739 TRect rect; |