Changeset 94060 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 2, 2022 3:33:28 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: QMouseEvent copy constructor is protected in 6.0, so tweak for mac. bugref:9898

File:

• trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp

@@ -312 +312 @@
                         && pHandle != pWatched)
                     {
-                        /* Create new mouse event with translated mouse positions. */
-                        QMouseEvent newME(pMouseEvent->type(),
-                                          pHandle->mapFromGlobal(pMouseEvent->globalPos()),
-                                          pMouseEvent->button(),
-                                          pMouseEvent->buttons(),
-                                          pMouseEvent->modifiers());
                         /* Check if we hit the handle */
                         bool fMarginHit = QRect(pHandle->mapToGlobal(QPoint(0, 0)), pHandle->size()).adjusted(-margin, 0, margin, 0).contains(pMouseEvent->globalPos());
@@ -328 +322 @@
                                 m_fHandleGrabbed = true;
                                 UICursor::setCursor(this, Qt::SplitHCursor);
-                                qApp->postEvent(pHandle, new QMouseEvent(newME));
+                                qApp->postEvent(pHandle, new QMouseEvent(pMouseEvent->type(),
+                                                                         pHandle->mapFromGlobal(pMouseEvent->globalPos()),
+                                                                         pMouseEvent->button(),
+                                                                         pMouseEvent->buttons(),
+                                                                         pMouseEvent->modifiers()));
                                 return true;
                             }
@@ -340 +338 @@
                             {
                                 UICursor::setCursor(this, Qt::SplitHCursor);
-                                qApp->postEvent(pHandle, new QMouseEvent(newME));
+                                qApp->postEvent(pHandle, new QMouseEvent(pMouseEvent->type(),
+                                                                         pHandle->mapFromGlobal(pMouseEvent->globalPos()),
+                                                                         pMouseEvent->button(),
+                                                                         pMouseEvent->buttons(),
+                                                                         pMouseEvent->modifiers()));
                                 return true;
                             }
-                            else
-                            {
-                                /* If not, reset the state. */
-                                m_fHandleGrabbed = false;
-                                UICursor::setCursor(this, Qt::ArrowCursor);
-                            }
+
+                            /* If not, reset the state. */
+                            m_fHandleGrabbed = false;
+                            UICursor::setCursor(this, Qt::ArrowCursor);
                         }
                     }