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

Timestamp:

Nov 17, 2009 10:14:50 AM (15 years ago)

Author:

vboxsync

Message:

QT GUI: don't unset mouse cursor after a resize event.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -1274 +1274 @@
 
                 /* do frame buffer dependent resize */
-#if defined (Q_WS_X11) && (QT_VERSION >= 0x040309) && (QT_VERSION < 0x040401)
+
                 /* restoreOverrideCursor() is broken in Qt 4.4.0 if WA_PaintOnScreen
                  * widgets are present. This is the case on linux with SDL. As
                  * workaround we save/restore the arrow cursor manually. See
                  * http://trolltech.com/developer/task-tracker/index_html?id=206165&method=entry
-                 * for details. */
+                 * for details.
+                 *
+                 * Moreover the current cursor, which could be set by the guest,
+                 * should be restored after resize.
+                 */
                 QCursor cursor;
                 if (shouldHideHostPointer())
@@ -1287 +1291 @@
                 mFrameBuf->resizeEvent (re);
                 viewport()->setCursor (cursor);
-#else
-                mFrameBuf->resizeEvent (re);
-                if (shouldHideHostPointer())
-                    viewport()->setCursor (QCursor (Qt::BlankCursor));
-                else
-                    viewport()->unsetCursor();
-#endif
 
 #ifdef Q_WS_MAC