Changeset 76987 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 25, 2019 12:38:01 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128399

Message:

FE/Qt: bugref:9373: UIGraphicsButton improvement allowing to set click policy to be on-release or on-press, where the last one allows for auto-repeat functionality.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics

Files:

• UIGraphicsButton.cpp (modified) (5 diffs)
• UIGraphicsButton.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp

@@ -19 +19 @@
 #include <QApplication>
 #include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
 #include <QPainter>
 #include <QStyle>
-#include <QGraphicsSceneMouseEvent>
+#include <QTimerEvent>
 
 /* GUI includes: */
@@ -32 +33 @@
     , m_icon(icon)
     , m_fParentSelected(false)
+    , m_enmClickPolicy(ClickPolicy_OnRelease)
+    , m_iDelayId(0)
+    , m_iRepeatId(0)
     , m_dIconScaleIndex(0)
 {
@@ -55 +59 @@
 {
     return m_dIconScaleIndex;
+}
+
+void UIGraphicsButton::setClickPolicy(ClickPolicy enmPolicy)
+{
+    m_enmClickPolicy = enmPolicy;
+}
+
+UIGraphicsButton::ClickPolicy UIGraphicsButton::clickPolicy() const
+{
+    return m_enmClickPolicy;
 }
 
@@ -124 +138 @@
 void UIGraphicsButton::mousePressEvent(QGraphicsSceneMouseEvent *pEvent)
 {
+    /* Call to base-class: */
+    QIGraphicsWidget::mousePressEvent(pEvent);
+
     /* Accepting this event allows to get release-event: */
     pEvent->accept();
+
+    /* For click-on-press policy: */
+    if (m_enmClickPolicy == ClickPolicy_OnPress)
+    {
+        /* Notify listeners about button click: */
+        emit sigButtonClicked();
+        /* Start delay timer: */
+        m_iDelayId = startTimer(500);
+    }
 }
 
@@ -132 +158 @@
     /* Call to base-class: */
     QIGraphicsWidget::mouseReleaseEvent(pEvent);
-    /* Notify listeners about button click: */
-    emit sigButtonClicked();
+
+    /* Depending on click policy: */
+    switch (m_enmClickPolicy)
+    {
+        /* For click-on-release policy: */
+        case ClickPolicy_OnRelease:
+        {
+            /* Notify listeners about button click: */
+            emit sigButtonClicked();
+            break;
+        }
+        /* For click-on-press policy: */
+        case ClickPolicy_OnPress:
+        {
+            /* We should stop all timers: */
+            killTimer(m_iDelayId);
+            killTimer(m_iRepeatId);
+            m_iDelayId = 0;
+            m_iRepeatId = 0;
+            break;
+        }
+    }
+}
+
+void UIGraphicsButton::timerEvent(QTimerEvent *pEvent)
+{
+    /* For click-on-press policy: */
+    if (m_enmClickPolicy == ClickPolicy_OnPress)
+    {
+        /* We should auto-repeat button click: */
+        emit sigButtonClicked();
+
+        /* For delay timer: */
+        if (pEvent->timerId() == m_iDelayId)
+        {
+            /* We should stop it and start repeat timer: */
+            killTimer(m_iDelayId);
+            m_iDelayId = 0;
+            m_iRepeatId = startTimer(90);
+        }
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.h

@@ -45 +45 @@
 public:
 
+    /** Click policy. */
+    enum ClickPolicy { ClickPolicy_OnRelease, ClickPolicy_OnPress };
+
     /* Constructor: */
     UIGraphicsButton(QIGraphicsWidget *pParent, const QIcon &icon);
@@ -55 +58 @@
     /** Returns icon scale index. */
     double iconScaleIndex() const;
+
+    /** Defines click @a enmPolicy. */
+    void setClickPolicy(ClickPolicy enmPolicy);
+    /** Returns click policy. */
+    ClickPolicy clickPolicy() const;
 
 protected:
@@ -79 +87 @@
     virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *pEvent);
 
+    /** Handles timer @a pEvent. */
+    virtual void timerEvent(QTimerEvent *pEvent) /* override */;
+
     /* Helpers: Update stuff: */
     virtual void refresh();
@@ -88 +99 @@
     bool m_fParentSelected;
 
+    /** Holds the click policy. */
+    ClickPolicy  m_enmClickPolicy;
+
+    /** Holds the delay timer ID. */
+    int  m_iDelayId;
+    /** Holds the repeat timer ID. */
+    int  m_iRepeatId;
+
     /** Holds the icon scale index. */
     double  m_dIconScaleIndex;