Qt: ExtToolButton: set delay relatively to dblclick's

diff --git a/modules/gui/qt4/util/customwidgets.cpp b/modules/gui/qt4/util/customwidgets.cpp
index 5042c41c35402532ebbbaf8291bedfd476834545..90c779194be7a85557e61537774adb086f851f24 100644 (file)
--- a/modules/gui/qt4/util/customwidgets.cpp
+++ b/modules/gui/qt4/util/customwidgets.cpp
@@ -36,6 +36,7 @@
 #include <QKeyEvent>
 #include <QWheelEvent>
 #include <QPixmap>
+#include <QApplication>
 #include <vlc_keys.h>
 
 QFramelessButton::QFramelessButton( QWidget *parent )
@@ -415,7 +416,8 @@ SpinningIcon::~SpinningIcon()
 QToolButtonExt::QToolButtonExt(QWidget *parent, int ms ): longClick( false )
 {
     setAutoRepeat( true );
-    setAutoRepeatDelay( ms );
+    /* default to twice the doubleclick delay */
+    setAutoRepeatDelay( ( ms > 0 )? ms : 2 * QApplication::doubleClickInterval() );
     setAutoRepeatInterval( 100 );
     connect( this, SIGNAL(released()), this, SLOT(releasedSlot()) );
 }

diff --git a/modules/gui/qt4/util/customwidgets.hpp b/modules/gui/qt4/util/customwidgets.hpp
index e4301b30a1967540886a40fdbdbb77a8304af9f7..82bef596f4ba3a8ab229cc60c6699c9875de60e4 100644 (file)
--- a/modules/gui/qt4/util/customwidgets.hpp
+++ b/modules/gui/qt4/util/customwidgets.hpp
@@ -52,7 +52,7 @@ class QToolButtonExt : public QToolButton
 {
     Q_OBJECT
 public:
-    QToolButtonExt( QWidget *parent = 0, int ms = 1000 );
+    QToolButtonExt( QWidget *parent = 0, int ms = 0 );
 private:
     bool longClick;
 private slots: