FCL/sf/mw/classicui: comparison uifw/ganes/src/HgVgMediaWall.cpp

equal deleted inserted replaced

-:aabf2c525e0f
+:9f56a4e1b8ab
 IgnoreEventsUntilNextPointerUp();
 InitScreenL( aRect );
 InitItemsL();
 HandleViewPositionChanged(ETrue);
 iCoeEnv->AddForegroundObserverL( *this );
 // setup Avkon gesture framework.
 iTouchFw->SetGestureInterestL(AknTouchGestureFw::EAknTouchGestureFwGroupDrag |
 AknTouchGestureFw::EAknTouchGestureFwGroupTap |
 AknTouchGestureFw::EAknTouchGestureFwGroupFlick);
 ActivateL ( );
+#ifdef MEDIAWALL_ORIENTATION_FIX
+iCoeEnv->WsSession().Flush();
+#endif
 SetMopParent( aParent );
 SetFlags( EHgVgMediaWallDrawToWindowGC | EHgVgMediaWallUninitialized );
 }
 // -----------------------------------------------------------------------------
 // CHgVgMediaWall::InitScreenL()
 // -----------------------------------------------------------------------------
 //
 EXPORT_C void CHgVgMediaWall::InitScreenL( const TRect& aRect )
 {
 // Set the windows size
 SetRect ( aRect );
+#ifdef MEDIAWALL_ORIENTATION_FIX
+TSize screenSize = iCoeEnv->ScreenDevice()->SizeInPixels();
+if (aRect == TRect(TPoint(0,0), screenSize) && iMediaWallStyle == EHgVgMediaWallStyleCoverflowFullScreen)
+{
+Window().FixNativeOrientation();
+}
+#endif
 }
 // -----------------------------------------------------------------------------
 // CHgVgMediaWall::RefreshScreen()
 // -----------------------------------------------------------------------------
 if( !iIsForeground  )
 {
 return;
 }
-//RDebug::Print(_L("\t\tMediaWall FirstIndexOnScreen=%d"), FirstIndexOnScreen());
 if( !iAnimationTimer->IsActive() )
 {
 if( /*iMediaWallStyle == EHgVgMediaWallStyleGrid ||*/
 (aIndex >= FirstIndexOnScreen() && aIndex <= FirstIndexOnScreen() + ItemsOnScreen()) )
 // Draws the display.
 // -----------------------------------------------------------------------------
 //
 void CHgVgMediaWall::Draw ( const TRect& /*aRect*/ ) const
 {
-//RDebug::Print(_L("CHgVgMediaWall::Draw begin"));
 if(iFlags & EHgVgMediaWallUninitialized)
 {
-MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+FillSystemGcWithSkin( );
-MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
-AknsDrawUtils::DrawBackground( skin, cc, this, SystemGc(), TPoint(0,0),
-Rect(), KAknsDrawParamDefault );
 return;
 }
 CHgVgMediaWall* self = const_cast<CHgVgMediaWall*>(this);
 SystemGc().BitBlt( Rect().iTl,screenshot );
 delete screenshot;
 }
 else
 {
-SystemGc().SetBrushColor(KRgbRed);
+FillSystemGcWithSkin( );
-SystemGc().Clear();
 }
 }
 else
 {
 }
 else
 {
 if (iSurfaceBitmap)
 {
-//RDebug::Print(_L("CHgVgMediaWall::Draw blit screenshot"));
 SystemGc().BitBlt( Rect().iTl, iSurfaceBitmap );
 }
 else
 {
-//RDebug::Print(_L("CHgVgMediaWall::Draw clear red"));
+FillSystemGcWithSkin( );
+}
-// we should not get here, ever
+}
-// still, clear with red color for debug purposes
-SystemGc().SetBrushColor(KRgbRed);
+}
-SystemGc().Clear();
-}
+void CHgVgMediaWall::FillSystemGcWithSkin( ) const
-}
+{
+MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-//RDebug::Print(_L("CHgVgMediaWall::Draw end"));
+MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
+AknsDrawUtils::DrawBackground( skin, cc, this, SystemGc(), TPoint(0,0),
+Rect(), KAknsDrawParamDefault );
 }
 // -----------------------------------------------------------------------------
 // CHgVgMediaWall::SizeChanged()
 // Called by framework when the view size is changed.
 CFbsBitmap* CHgVgMediaWall::DrawToBitmap()
 {
 if (!DrawAll())
 return NULL;
-return iEGL->GetSurfaceToBitmap(iRect);
+#ifdef MEDIAWALL_ORIENTATION_FIX
+return iEGL->GetSurfaceToBitmap(iRect, iMediaWallStyle == EHgVgMediaWallStyleCoverflowFullScreen);
+#else
+return iEGL->GetSurfaceToBitmap(iRect, EFalse);
+#endif
 }
 // -----------------------------------------------------------------------------
 // CHgVgMediaWall::InitDefaultIconL()
 // -----------------------------------------------------------------------------
 // CHgVgMediaWall::HandleGainingForeground()
 // ---------------------------------------------------------------------------
 //
 void CHgVgMediaWall::HandleGainingForeground()
 {
+if(iIsForeground) return; // don't react to gaining foreground without losing it
 // draw previous screenshot
 DrawNow();
 // delete it
 // CHgVgMediaWall::HandleLosingForeground()
 // ---------------------------------------------------------------------------
 //
 void CHgVgMediaWall::HandleLosingForeground()
 {
+if(!iIsForeground) return; // don't react to losing foreground without gaining it
 // make sure we are not animating
 HandleTransitionAnimationStop();
 if (iAnimationTimer->IsActive())
 return;
 }
 CHgVgMediaWall* self = const_cast<CHgVgMediaWall*>(this);
-//RDebug::Print(_L("\t\tMediaWall FirstIndexOnScreen=%d"), self->FirstIndexOnScreen());
 if (!self->DrawAll())
 return;
 iEGL->SwapBuffers();
 }
 else
 {
 // update view position dependant stuff
 HandleViewPositionChanged(ETrue);
+// inform observer when needed
+if (!iObserverNotified)
+{
+if (Abs(iSpring->GetX() - iSpring->EndX()) < KHalfItemWidth)
+{
+iObserverNotified = ETrue;
+TRAP_IGNORE(
+iSelectionObserver->HandleSelectL((int)iSpring->EndX(), this);  )
+}
+}
 }
 }
 void CHgVgMediaWall::HandleTransitionAnimationStop()
 // cancel animation
 iAnimationTimer->Cancel();
 // handle view position change
-HandleViewPositionChanged();
+HandleViewPositionChanged(EFalse);
 }
 }
 // ---------------------------------------------------------------------------
 iScrollBar = CHgVgScrollBar::NewL(*this, iRect,
 TSize(MaxViewPosition(), 1), TSize(1, 1),
 ETrue, CHgScroller::EHgScrollerScrollBar);
 iScrollBar->SetViewPosition( TPoint(iSelectedIndex, 0) );
 }
 // ---------------------------------------------------------------------------
 // CHgVgMediaWall::InitRenderingL()
 // Inits all rendering.
 else
 {
 if (aRecreateSurface)
 iEGL->InitWindowSurfaceL(Window());
 }
 delete iRenderer; iRenderer = NULL;
 delete iArtistLabel; iArtistLabel = NULL;
 delete iAlbumLabel; iAlbumLabel = NULL;
 delete iLetterPopup; iLetterPopup = NULL;
 rect.LayoutRect(iRect, AknLayoutScalable_Apps::main_cf0_pane_g1(0));
 iHideSKButton = CHgVgButton::NewL(rect.Rect().Size(), rect.Rect().iTl, *icon);
 CleanupStack::PopAndDestroy(icon);
 }
 // ---------------------------------------------------------------------------
 // CHgVgMediaWall::CreateIconL()
 // ---------------------------------------------------------------------------
 //
 void CHgVgMediaWall::DrawScene()
 {
-TReal t = iSpring->VelX() / iSpringVelocityToAnimationFactor;
+TReal springVel = iSpring->VelX();
-if (Abs(t) > 1.0f)
+if (iPointerDown)
-t = t / Abs(t);
+springVel = iSpringDragVel;
+TReal t = springVel / iSpringVelocityToAnimationFactor;
+if (t > 1.0f)
+t = 1.0f;
+else if (t < -1.0f)
+t = -1.0f;
 if (AknLayoutUtils::LayoutMirrored())
 t = -t;
 iRenderer->SetCameraRotation(-t * iCameraRotationFactor);
 if (iMediaWallStyle == EHgVgMediaWallStyleGrid)
 {
 iSelGridItem, iPrevGridItem, iAnimationAlpha, iAnimationState,
 iPickedGridItem, iOpeningAnimationType);
 }
 else
 {
 iRenderer->Draw(iItems, /*iSelectedIndex*/iSpring->GetX(), iSpring->EndX(),
 iSpring->GetInterpolatedX(), iAnimationAlpha, iAnimationState,
-iOpeningAnimationType, iMediaWallStyle, iSpring->StartX());
+iOpeningAnimationType, iMediaWallStyle, iSpring->StartX(), springVel);
 }
 }
 // ---------------------------------------------------------------------------
 // CHgVgMediaWall::HandleDragStart()
 {
 iAnimationTimer->Cancel();
 if (iMediaWallStyle != EHgVgMediaWallStyleGrid)
 {
 iSpring->SetEnd(iSelectedIndex, iSpring->EndY());
 }
-}
+iSpringVelAtDragStart = iSpringDragVel = iSpring->VelX();
+}
+else
+{
+iSpringVelAtDragStart = iSpringDragVel = 0;
+}
 iPointerDown = ETrue;
+iDragFrames = 0;
 iViewPositionAtDragStart = iSpring->GetX();
 }
 // ---------------------------------------------------------------------------
 // CHgVgMediaWall::HandleDragOn()
 {
 // for normal mediawall we move view position according to drag
 TReal x = iViewPositionAtDragStart + fDelta * iItemsToMoveOnFullScreenDrag;
 iUpdateScrollBar = ETrue;
 iSpring->Reset(x, 0);
+// interpolate velocity during frame count to zero
+TReal t = (TReal)iDragFrames/(TReal)KFramesToZeroVelocity;
+if (t > 1.0f) t = 1.0f;
+iSpringDragVel = iSpringVelAtDragStart * (1.0f - t);
+iDragFrames++;
 HandleViewPositionChanged(ETrue);
 // draw view at new view position
 DrawOpenVG();
 }
 }
 void CHgVgMediaWall::StartAnimationToPosition(TReal aX, TReal aY, TBool aUpdateScrollBar)
 {
 iSpring->SetEnd(aX, aY);
 iUpdateScrollBar = aUpdateScrollBar;
 iAnimationState = EHgVgMediaWallAnimationStateTransition;
+iObserverNotified = EFalse;
 StartAnimationTimer();
 }
 // -----------------------------------------------------------------------------
 // CHgVgMediaWall::SetFlags()
 KMediaWallFullScreenSpringK,
 KMediaWallFullScreenSpringDamping,
 KMediaWallFullScreenSpringMaxVelocity,
 KPositionSnap, KMinSpringVelocity);
+#ifdef MEDIAWALL_ORIENTATION_FIX
+iRenderer->EnableLandscapeMode(ETrue);
+iAlbumLabel->EnableLandscapeRendering(ETrue);
+iArtistLabel->EnableLandscapeRendering(ETrue);
+iEmptyLabel->EnableLandscapeRendering(ETrue);
+iSkinRenderer->EnableLanscapeRendering(ETrue);
+iScrollBar->EnableLandscapeRendering(ETrue);
+iHideSKButton->EnableLandscapeRendering(ETrue);
+iLetterPopup->EnableLandscapeRendering(ETrue);
+#endif
 }
 // -----------------------------------------------------------------------------
 // CHgVgMediaWall::CreateMediaWallTBonePortraitL()
 // -----------------------------------------------------------------------------
 iAlbumLabel = CHgVgLabel::NewL( t0.TextRect() );
 iArtistLabel = CHgVgLabel::NewL( t1.TextRect() );
 iAlbumLabel->SetLayout(l0, iRect);
 iArtistLabel->SetLayout(l1, iRect);
 }
 void CHgVgMediaWall::InitPopupL(TInt aLayoutVariant)
 {
 TAknLayoutRect popupRect;
 popupRect.LayoutRect( iRect, AknLayoutScalable_Apps::cf0_flow_pane_g2(aLayoutVariant) );
 iLetterPopup = CHgVgPopup::NewL(popupRect.Rect(),
 &ScreenFont( TCoeFont( KMediaWallTBonePopupFontSize, TCoeFont::EPlain )));
 iLetterPopup->SetLayouts(AknLayoutScalable_Apps::cf0_flow_pane_g2(aLayoutVariant),
 AknLayoutScalable_Apps::cf0_flow_pane_t1(aLayoutVariant), iRect);
 }
 // -----------------------------------------------------------------------------
 // CHgVgMediaWall::DelayedInit()
 // -----------------------------------------------------------------------------
 }
 return KErrNone;
 }
 // End of File

branch	RCL_3
changeset 10	9f56a4e1b8ab
parent 9	aabf2c525e0f
child 16	71dd06cfe933