Changeset 769 for trunk/demos/composition

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/composition/composition.cpp (modified) (6 diffs)
• demos/composition/composition.h (modified) (4 diffs)

trunk/demos/composition/composition.cpp

@@ -48 +48 @@
 #include <QMouseEvent>
 #include <qmath.h>
+
+const int animationInterval = 15; // update every 16 ms = ~60FPS
 
 CompositionWidget::CompositionWidget(QWidget *parent)
@@ -237 +239 @@
 {
     m_animation_enabled = true;
+    m_animationTimer = startTimer(animationInterval);
 #ifdef Q_WS_QWS
     m_image = QPixmap(":res/composition/flower.jpg");
@@ -263 +266 @@
     rect.translate(-size.width()/2, -size.height()/2);
     return rect;
+}
+
+void CompositionRenderer::setAnimationEnabled(bool enabled)
+{
+    if (m_animation_enabled == enabled)
+        return;
+    m_animation_enabled = enabled;
+    if (enabled) {
+        Q_ASSERT(!m_animationTimer);
+        m_animationTimer = startTimer(animationInterval);
+    } else {
+        killTimer(m_animationTimer);
+        m_animationTimer = 0;
+    }
 }
 
@@ -472 +489 @@
 #endif
     }
-
-    if (m_animation_enabled && m_current_object == NoObject) {
-        updateCirclePos();
-    }
 }
 
@@ -490 +503 @@
         m_current_object = NoObject;
     }
+    if (m_animation_enabled) {
+        killTimer(m_animationTimer);
+        m_animationTimer = 0;
+    }
 }
 
@@ -501 +518 @@
     m_current_object = NoObject;
 
-    if (m_animation_enabled)
+    if (m_animation_enabled) {
+        Q_ASSERT(!m_animationTimer);
+        m_animationTimer = startTimer(animationInterval);
+    }
+}
+
+void CompositionRenderer::timerEvent(QTimerEvent *event)
+{
+    if (event->timerId() == m_animationTimer)
         updateCirclePos();
 }

trunk/demos/composition/composition.h

@@ -110 +110 @@
     void paint(QPainter *);
 
-    void mousePressEvent(QMouseEvent *);
-    void mouseMoveEvent(QMouseEvent *);
-    void mouseReleaseEvent(QMouseEvent *);
-
     void setCirclePos(const QPointF &pos);
 
@@ -121 +117 @@
     int circleColor() const { return m_circle_hue; }
     int circleAlpha() const { return m_circle_alpha; }
+
+protected:
+    void mousePressEvent(QMouseEvent *);
+    void mouseMoveEvent(QMouseEvent *);
+    void mouseReleaseEvent(QMouseEvent *);
+    void timerEvent(QTimerEvent *);
 
 public slots:
@@ -151 +153 @@
     void setCircleAlpha(int alpha) { m_circle_alpha = alpha; update(); }
     void setCircleColor(int hue) { m_circle_hue = hue; update(); }
-    void setAnimationEnabled(bool enabled) { m_animation_enabled = enabled; update(); }
+    void setAnimationEnabled(bool enabled);
 
 private:
@@ -178 +180 @@
     ObjectType m_current_object;
     bool m_animation_enabled;
+    int m_animationTimer;
 
 #ifdef QT_OPENGL_SUPPORT