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

Timestamp:

Dec 9, 2022 12:23:08 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixing Runtime UI bug with invisible borders for captured mouse cursor on X11 and macOS hosts.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDesktopWidgetWatchdog.cpp (modified) (1 diff)
• globals/UIDesktopWidgetWatchdog.h (modified) (1 diff)
• runtime/UIMouseHandler.cpp (modified) (2 diffs)
• runtime/UIMouseHandler.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp

@@ -463 +463 @@
     /* Return region: */
     return region;
-}
-
-/* static */
-int UIDesktopWidgetWatchdog::overallDesktopWidth()
-{
-    return overallScreenRegion().boundingRect().width();
-}
-
-/* static */
-int UIDesktopWidgetWatchdog::overallDesktopHeight()
-{
-    return overallScreenRegion().boundingRect().height();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.h

@@ -117 +117 @@
     /** Returns overall region unifying all the host-screen available-geometries. */
     static QRegion overallAvailableRegion();
-    /** Returns overall desktop width. */
-    static int overallDesktopWidth();
-    /** Returns overall desktop height. */
-    static int overallDesktopHeight();
 
 #ifdef VBOX_WS_X11

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp

@@ -174 +174 @@
         /* Memorize the host position where the cursor was captured: */
         m_capturedMousePos = QCursor::pos();
+        /* Determine geometry of screen cursor was captured at: */
+        m_capturedScreenGeo = gpDesktop->screenGeometry(m_capturedMousePos);
 
         /* Acquiring visible viewport rectangle in global coodrinates: */
@@ -1034 +1036 @@
             m_fCursorPositionReseted = false;
         }
-#else /* VBOX_WS_WIN */
-        int iWe = UIDesktopWidgetWatchdog::overallDesktopWidth() - 1;
-        int iHe = UIDesktopWidgetWatchdog::overallDesktopHeight() - 1;
+#else /* !VBOX_WS_WIN */
+        /* Compose boundaries: */
+        const int iX1 = m_capturedScreenGeo.left() + 1;
+        const int iY1 = m_capturedScreenGeo.top() + 1;
+        const int iX2 = m_capturedScreenGeo.right() - 1;
+        const int iY2 = m_capturedScreenGeo.bottom() - 1;
+
+        /* Simulate infinite movement: */
         QPoint p = globalPos;
-        if (globalPos.x() == 0)
-            p.setX(iWe - 1);
-        else if (globalPos.x() == iWe)
-            p.setX( 1 );
-        if (globalPos.y() == 0)
-            p.setY(iHe - 1);
-        else if (globalPos.y() == iHe)
-            p.setY(1);
+        if (globalPos.x() <= iX1)
+            p.setX(iX2 - 1);
+        else if (globalPos.x() >= iX2)
+            p.setX(iX1 + 1);
+        if (globalPos.y() <= iY1)
+            p.setY(iY2 - 1);
+        else if (globalPos.y() >= iY2)
+            p.setY(iY1 + 1);
 
         if (p != globalPos)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h

@@ -150 +150 @@
     QPoint m_lastMousePos;
     QPoint m_capturedMousePos;
+    QRect m_capturedScreenGeo;
     int m_iLastMouseWheelDelta;
     int m_iMouseCaptureViewIndex;