--- a/ganeswidgets/src/hgmediawallrenderer.cpp Thu May 27 13:59:05 2010 +0300
+++ b/ganeswidgets/src/hgmediawallrenderer.cpp Fri Jun 11 14:43:11 2010 +0300
@@ -14,7 +14,7 @@
* Description:
*
*/
-#include "HgMediaWallRenderer.h"
+#include "hgmediawallrenderer.h"
#include "hgmediawalldataprovider.h"
#include "hgquadrenderer.h"
#include "hgquad.h"
@@ -22,19 +22,19 @@
#include "HgImageFader.h"
#include "hgvgquadrenderer.h"
#include "hgqtquadrenderer.h"
-#include <qvector3d>
-#include <qtimer>
-#include <qpropertyanimation>
-#include <qstate.h>
-#include <qabstracttransition>
-#include <qstatemachine>
-#include <qsignaltransition>
-#include <qsequentialanimationgroup>
-#include <qparallelanimationgroup>
-#include <qvariantanimation>
-#include <qpolygon>
-#include <qpainter>
-#include <qpaintengine>
+#include <QVector3D>
+#include <QTimer>
+#include <QPropertyAnimation>
+#include <QState>
+#include <QAbstractTransition>
+#include <QStateMachine>
+#include <QSignalTransition>
+#include <QSequentialAnimationGroup>
+#include <QParallelAnimationGroup>
+#include <QVariantAnimation>
+#include <QPolygon>
+#include <QPainter>
+#include <QPaintEngine>
const qreal KPi = 3.1415926535897932384626433832795;
@@ -178,7 +178,7 @@
qreal posY = 0.5f - (rect.height() / rect.width() / 2.0 - stepY / 2.0);
tm.translate(-posY,0);
rm.rotate(-90, QVector3D(0,0,1));
- rot = QQuaternion::fromAxisAndAngle(QVector3D(0,0,1), -90);
+ rot = QQuaternion::fromAxisAndAngle(QVector3D(0,0,1), 90);
}
else if (mNextScrollDirection == Qt::Vertical)
{
@@ -187,7 +187,6 @@
rot = QQuaternion::fromAxisAndAngle(QVector3D(0,0,1), -90);
}
-
}
HgAnimatedQuad* createQuad(HgQuad* qA, HgQuad* qB) const
@@ -725,6 +724,8 @@
const QTransform& sceneTransform,
const QRectF& rect)
{
+ Q_UNUSED(sceneTransform)
+ Q_UNUSED(rect)
// save state for current orientation
setupRows(startPosition, position, targetPosition, springVelocity, painter);
@@ -763,6 +764,9 @@
const QTransform& sceneTransform,
const QRectF& rect)
{
+ Q_UNUSED(sceneTransform)
+ Q_UNUSED(rect)
+
setupRows(startPosition, position, targetPosition, springVelocity, painter);
recordState(mOldState);
@@ -983,7 +987,7 @@
quad->setPosition(pos);
const HgImage* image = mDataProvider->image(itemIndex);
quad->setImage(image);
- quad->setVisible(true/*image && image->alpha() != 0*/);
+ quad->setVisible(image && image->alpha() != 0);
quad->setScale(QVector2D(mImageSize3D.width(),mImageSize3D.height()));
quad->setPivot(QVector2D(0,0));
quad->setUserData(QVariant(itemIndex));
@@ -999,7 +1003,7 @@
{
HgQuad* indicator = mRenderer->quad(quadIndex++);
setupIndicator(quad, indicator, indicatorImage,
- itemIndex);
+ itemIndex+1000);
indicator->enableMirrorImage(reflectionsEnabled);
}