WebSVN – tpanel – Diff – /trunk/tqscrollarea.cpp

 /*****************************************************************************
  * Signals and overwritten functions start here
  *****************************************************************************/
+void TQScrollArea::scrollContentsBy(int dx, int dy)
+{
+    DECL_TRACER("TQScrollArea::scrollContentsBy(int dx, int dy)");
+    QScrollArea::scrollContentsBy(dx, dy);      // First let the original class do it's job.
+    QScrollBar *sbar = nullptr;
+    if (mVertical)
+        sbar = verticalScrollBar();
+    else
+        sbar = horizontalScrollBar();
+    if (sbar)
+    {
+        mActPosition = sbar->value();
+        MSG_DEBUG("Actual slider position: " << mActPosition);
+        if (mScrollbar && mScrollbarOffset > 0 && mActPosition < mScrollbarOffset)
+        {
+            sbar->setSliderPosition(mScrollbarOffset);
+            mActPosition = sbar->value();
+        }
+    }
+}
 void TQScrollArea::mouseMoveEvent(QMouseEvent* event)
+{
     DECL_TRACER("TQScrollArea::mouseMoveEvent(QMouseEvent* event)");
     mMousePress = false;
     mMouseScroll = true;
+    mDoMouseEvent = false;
     if (mMousePressTimer && mMousePressTimer->isActive())
         mMousePressTimer->stop();
     int move = 0;
                 int value = bar->value();
                 int newValue = value + (move * -1);
                 if (newValue >= 0 && newValue != value)
                     bar->setValue(newValue);
-                MSG_DEBUG("Moving mouse to value " << newValue << " (old: " << value << "). Step is " << move);
+            }
+        }
+    }
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 void TQScrollArea::mousePressEvent(QMouseEvent* event)
+{
     DECL_TRACER("TQScrollArea::mousePressEvent(QMouseEvent* event)");
-    if (!event || mMouseScroll)
+    if (!event || mMouseScroll || event->button() != Qt::LeftButton)
         return;
-    if (event->button() == Qt::LeftButton)
-    {
-        mMousePress = true;
+    mMousePress = true;
-        mOldPoint.setX(0.0);
+    mOldPoint.setX(0.0);
-        mOldPoint.setY(0.0);
+    mOldPoint.setY(0.0);
-        int x = 0, y = 0;
+    int x = 0, y = 0;
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-        x = event->pos().x();
+    x = event->pos().x();
-        y = event->pos().y();
+    y = event->pos().y();
 #else
-        x = event->position().x();
+    x = event->position().x();
-        y = event->position().y();
+    y = event->position().y();
 #endif
-        mLastMousePress.setX(x);
+    mLastMousePress.setX(x);
-        mLastMousePress.setY(y);
+    mLastMousePress.setY(y);
-        MSG_DEBUG("Mouse press event at " << x << " x " << y << " // " << event->globalX() << " x " << event->globalY());
-        /*
-         * Here we're starting a timer with 200 ms. If after this time the
-         * mouse button is still pressed and no scroll event was detected,
-         * then we've a real click.
-         * In case of a real click the method mouseTimerEvent() will call a
-         * signal to inform the parent about the click.
-         */
-        mClick = true;
-        if (!mMousePressTimer)
-        {
-            mMousePressTimer = new QTimer(this);
-            connect(mMousePressTimer, &QTimer::timeout, this, &TQScrollArea::mouseTimerEvent);
-        }
+    MSG_DEBUG("Mouse press event at " << x << " x " << y << " // " << event->globalX() << " x " << event->globalY());
+    /*
+        * Here we're starting a timer with 200 ms. If after this time the
+        * mouse button is still pressed and no scroll event was detected,
-        mMousePressTimer->start(200);
+        * then we've a real click.
+        * In case of a real click the method mouseTimerEvent() will call a
+        * signal to inform the parent about the click.
-    }
+        */
+    mClick = true;  // This means PRESSED state
+    mMouseTmEventActive = true;
+    mDoMouseEvent = true;
+    QTimer::singleShot(200, this, &TQScrollArea::mouseTimerEvent);
+}
 void TQScrollArea::mouseReleaseEvent(QMouseEvent* event)
+{
     DECL_TRACER("TQScrollArea::mouseReleaseEvent(QMouseEvent* event)");
-    if (!event)
+    if (!event || event->button() != Qt::LeftButton)
         return;
-    if(event->button() == Qt::LeftButton)
-    {
-        if (mMousePressTimer && mMousePressTimer->isActive())
-        {
-            mMousePressTimer->stop();
+    mDoMouseEvent = false;
-            if (!mMouseScroll)
-            {
-                mClick = true;
-                mouseTimerEvent();
+    if (mMouseTmEventActive)
-                mClick = false;
-                mouseTimerEvent();
-            }
-        }
+    {
-        else if (!mMouseScroll && mClick)
+        if (!mMouseScroll)
+        {
+            mClick = true;      // This means PRESSED state
-            mClick = false;
+            doMouseEvent();
+            mClick = false;     // This means RELEASED state
-            mouseTimerEvent();
+            doMouseEvent();
+        }
-        mMousePress = false;
-        mMouseScroll = false;
-        mOldPoint.setX(0.0);
-        mOldPoint.setY(0.0);
+    }
-}
-void TQScrollArea::scrollContentsBy(int dx, int dy)
-{
-    DECL_TRACER("TQScrollArea::scrollContentsBy(int dx, int dy)");
-    QScrollArea::scrollContentsBy(dx, dy);      // First let the original class do it's job.
-    QScrollBar *sbar = nullptr;
-    if (mVertical)
-        sbar = verticalScrollBar();
+    else if (!mMouseScroll && mClick)
-    else
-        sbar = horizontalScrollBar();
-    if (sbar)
+    {
-        mActPosition = sbar->value();
-        MSG_DEBUG("Actual slider position: " << mActPosition);
+        mClick = false;         // This means RELEASED state
-        if (mScrollbar && mScrollbarOffset > 0 && mActPosition < mScrollbarOffset)
-        {
-            sbar->setSliderPosition(mScrollbarOffset);
-            mActPosition = sbar->value();
+        doMouseEvent();
-        }
+    }
+    mMousePress = false;
+    mMouseScroll = false;
+    mOldPoint.setX(0.0);
+    mOldPoint.setY(0.0);
+}
-void TQScrollArea::mouseTimerEvent()
+void TQScrollArea::doMouseEvent()
+{
-    DECL_TRACER("TQScrollArea::mouseTimerEvent()");
+    DECL_TRACER("TQScrollArea::doMouseEvent()");
-    if (mMousePressTimer && mMousePressTimer->isActive())
-        mMousePressTimer->stop();
-    if (!mMousePress || mMouseScroll)
+    if (!mMousePress || mMouseScroll || !mMain)
         return;
+    QWidget *w = nullptr;
-    if (mMain)
+    if (mVertical)
+        w = mMain->childAt(mLastMousePress.x(), mActPosition + mLastMousePress.y());
-    {
+    else
-        QWidget *w = nullptr;
+        w = mMain->childAt(mActPosition + mLastMousePress.x(), mLastMousePress.y());
-        if (mVertical)
+    if (!w)
-            w = mMain->childAt(mLastMousePress.x(), mActPosition + mLastMousePress.y());
-        else
+        return;
-            w = mMain->childAt(mActPosition + mLastMousePress.x(), mLastMousePress.y());
-        if (w)
-        {
-            QString obname = w->objectName();
+    QString obname = w->objectName();
-            ulong handle = extractHandle(obname.toStdString());
+    ulong handle = extractHandle(obname.toStdString());
-            if (!handle)
+    if (!handle)
-                return;
+        return;
-            // We must make sure the found object is not marked as pass through.
+    // We must make sure the found object is not marked as pass through.
-            // Because of this we'll scan the items for the handle and if we
+    // Because of this we'll scan the items for the handle and if we
-            // find that it is marked as pass through we must look for another
+    // find that it is marked as pass through we must look for another
-            // one on the same position. If there is none, the click is ignored.
+    // one on the same position. If there is none, the click is ignored.
-            //
+    //
-            // Find the object in our list
+    // Find the object in our list
-            vector<_ITEMS_T>::iterator iter;
+    vector<_ITEMS_T>::iterator iter;
-            QRect rect;
+    QRect rect;
-            bool call = true;
+    bool call = true;
-            for (iter = mItems.begin(); iter != mItems.end(); ++iter)
+    for (iter = mItems.begin(); iter != mItems.end(); ++iter)
-            {
+    {
-                if (iter->handle == handle)     // Handle found?
+        if (iter->handle == handle)     // Handle found?
-                {                               // Yes, then ...
+        {                               // Yes, then ...
-                    if (iter->bounding == "passThru")   // Item marked as pass through?
+            if (iter->bounding == "passThru")   // Item marked as pass through?
-                    {                                   // Yes, then start to search for another item
+            {                                   // Yes, then start to search for another item
-                        rect = w->rect();
+                rect = w->rect();
-                        call = false;
+                call = false;
-                        // Walk through the childs to find another one on the
+                // Walk through the childs to find another one on the
-                        // clicked position.
+                // clicked position.
-                        QObjectList ol = mMain->children(); // Get list of all objects
+                QObjectList ol = mMain->children(); // Get list of all objects
-                        QList<QObject *>::iterator obiter;  // Define an iterator
+                QList<QObject *>::iterator obiter;  // Define an iterator
-                        // Loop through all objects
+                // Loop through all objects
-                        for (obiter = ol.begin(); obiter != ol.end(); ++obiter)
+                for (obiter = ol.begin(); obiter != ol.end(); ++obiter)
-                        {
+                {
-                            QObject *object = *obiter;
+                    QObject *object = *obiter;
-                            if (object->objectName() != obname && object->objectName().startsWith("Label_"))    // Have we found a QLabel object?
+                    if (object->objectName() != obname && object->objectName().startsWith("Label_"))    // Have we found a QLabel object?
-                            {                                                                                   // Yes, then test it's position
+                    {                                                                                   // Yes, then test it's position
-                                QLabel *lb = dynamic_cast<QLabel *>(object);    // Cast the object to a QLabel
+                        QLabel *lb = dynamic_cast<QLabel *>(object);    // Cast the object to a QLabel
-                                if (lb->rect().contains(mLastMousePress))       // Is the QLabel under the mouse coordinates?
+                        if (lb->rect().contains(mLastMousePress))       // Is the QLabel under the mouse coordinates?
-                                {                                               // Yes, then select it.
+                        {                                               // Yes, then select it.
-                                    ulong h = extractHandle(lb->objectName().toStdString());  // Get the handle
+                            ulong h = extractHandle(lb->objectName().toStdString());  // Get the handle
-                                    if (!h)
+                            if (!h)
-                                        break;
+                                break;
-                                    handle = h;
+                            handle = h;
-                                    // Reset the main loop
+                            // Reset the main loop
-                                    iter = mItems.begin();
+                            iter = mItems.begin();
-                                    break;
-                                }
+                            break;
-                            }
+                        }
+                    }
-                    else
-                        call = true;
+                }
+            }
-            if (call)
+            else
+            {
-                MSG_DEBUG("Calling signal with handle " << (handle >> 16 & 0x0000ffff) << ":" << (handle & 0x0000ffff) << ": STATE=" << (mClick ? "PRESSED" : "RELEASED"));
+                call = true;
-                emit objectClicked(handle, mClick);
+                break;
+            }
+        }
+    }
+    if (call)
+    {
+        MSG_DEBUG("Calling signal with handle " << (handle >> 16 & 0x0000ffff) << ":" << (handle & 0x0000ffff) << ": STATE=" << (mClick ? "PRESSED" : "RELEASED"));
+        emit objectClicked(handle, mClick);
+        mClick = false;
+    }
+}
+void TQScrollArea::mouseTimerEvent()
+{
+    DECL_TRACER("TQScrollArea::mouseTimerEvent()");
+    if (!mDoMouseEvent)
+        return;
+    mDoMouseEvent = false;
+    if (mClick)         // Only if PRESSED
+        doMouseEvent();
+    mMouseTmEventActive = false;
+}

Subversion Repositories tpanel

(root)/trunk/tqscrollarea.cpp @ 327 – Rev 319 → 320