Changeset 12018 in vbox for trunk

Timestamp:

Sep 3, 2008 8:37:55 AM (16 years ago)

Author:

vboxsync

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

35930

Message:

better fix for the mouse cursor problem with qt4.4.0 than r35553

Location:

trunk/src/VBox/Frontends/VirtualBox4/src

Files:

• VBoxConsoleView.cpp (modified) (1 diff)
• VBoxConsoleWnd.cpp (modified) (1 diff)

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

@@ -1095 +1095 @@
 
                 /* 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. */
+                QCursor cursor = viewport()->cursor();
+                mFrameBuf->resizeEvent (re);
+                viewport()->setCursor(cursor);
+#else
                 mFrameBuf->resizeEvent (re);
                 viewport()->unsetCursor();
+#endif
 
                 /* This event appears in case of guest video was changed

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -1112 +1112 @@
                 }
             }
-            /* 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 set the arrow cursor manually.
-             * See http://trolltech.com/developer/task-tracker/index_html?id=206165&method=entry
-             * for details. */
-#if defined (Q_WS_X11) && (QT_VERSION >= 0x040309) && (QT_VERSION < 0x040401)
-            qApp->setOverrideCursor(Qt::ArrowCursor);
-#endif
             break;
         }