Changeset 124 for smplayer/trunk/src/floatingwidget.cpp

Timestamp:

Mar 16, 2012, 4:02:47 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: 0.7.1 trunk update

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/floatingwidget.cpp (modified) (7 diffs)

smplayer/trunk/src/floatingwidget.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -22 +22 @@
 #include <QHBoxLayout>
 
+#ifndef OLD_ANIMATION
+#include <QPropertyAnimation>
+#endif
+
 FloatingWidget::FloatingWidget( QWidget * parent )
         : QWidget( parent, Qt::Window | Qt::FramelessWindowHint |
                        Qt::WindowStaysOnTopHint )
 {
+#ifndef OLD_ANIMATION
+        animation = 0;
+#endif
+
         setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum );
 
@@ -40 +48 @@
         _margin = 0;
         _animated = false;
+#ifdef OLD_ANIMATION
         animation_timer = new QTimer(this);
         animation_timer->setInterval(2);
         connect( animation_timer, SIGNAL(timeout()), this, SLOT(animate()) );
-
+#endif
         connect( &auto_hide_timer, SIGNAL(timeout()), 
              this, SLOT(checkUnderMouse()) );
@@ -50 +59 @@
 
 FloatingWidget::~FloatingWidget() {
+#ifndef OLD_ANIMATION
+        if (animation) delete animation;
+#endif
 }
 
@@ -105 +117 @@
 
 void FloatingWidget::showAnimated(QPoint final_position, Movement movement) {
+#ifndef OLD_ANIMATION
+        show();
+        if (!animation) {
+                animation = new QPropertyAnimation(this, "pos");
+        }
+        animation->setDuration(300);
+        animation->setEasingCurve(QEasingCurve::OutBounce);
+        animation->setEndValue(final_position);
+        QPoint initial_position = final_position;
+        if (movement == Upward) {
+                initial_position.setY( initial_position.y() + height() );
+        } else {
+                initial_position.setY( initial_position.y() - height() );
+        }
+        animation->setStartValue(initial_position);
+
+        animation->start();
+#else
         current_movement = movement;
         final_y = final_position.y();
@@ -118 +148 @@
 
         animation_timer->start();
+#endif
 }
 
+#ifdef OLD_ANIMATION
 void FloatingWidget::animate() {
         if (current_y == final_y) {
@@ -128 +160 @@
         }
 }
+#endif
 
 void FloatingWidget::checkUnderMouse() {