Changeset 8416 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 28, 2008 12:06:36 PM (17 years ago)

Author:

vboxsync

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

30260

Message:

Frontends/VirtualBox3/4: removed seamless timer hack

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/include/VBoxConsoleView.h (modified) (1 diff)
• VirtualBox/src/VBoxConsoleView.cpp (modified) (4 diffs)
• VirtualBox4/include/VBoxConsoleView.h (modified) (1 diff)
• VirtualBox4/src/VBoxConsoleView.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -240 +240 @@
 
     QTimer *resize_hint_timer;
-    QTimer *mToggleFSModeTimer;
 
     VBoxDefs::RenderMode mode;

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

@@ -668 +668 @@
              this, SLOT (doResizeHint()));
 
-    mToggleFSModeTimer = new QTimer (this);
-    connect (mToggleFSModeTimer, SIGNAL (timeout()),
-             this, SIGNAL (resizeHintDone()));
-
     /* setup rendering */
 
@@ -1041 +1037 @@
                 LogFlow (("VBoxDefs::ResizeEventType: %d x %d x %d bpp\n",
                           re->width(), re->height(), re->bitsPerPixel()));
-
-                if (mToggleFSModeTimer->isActive())
-                    mToggleFSModeTimer->stop();
 
                 /* do frame buffer dependent resize */
@@ -1533 +1526 @@
             case QEvent::Resize:
             {
+                /* This timer is used to prevent the guest from
+                 * being swamped with resize requests when the user
+                 * resizes the window by dragging the mouse.  The
+                 * guest will not get a request until 300ms after
+                 * the last mouse movement. */
                 if (!mIgnoreMainwndResize &&
                     mIsAdditionsActive && mAutoresizeGuest)
@@ -2235 +2233 @@
         doResizeHint (newSize);
     }
-    mToggleFSModeTimer->start (2000, true);
 }
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleView.h

@@ -257 +257 @@
     long muCapsLockAdaptionCnt;
 
-    QTimer *mToggleFSModeTimer;
-
     VBoxDefs::RenderMode mode;
 

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

@@ -676 +676 @@
     ::memset (mPressedKeys, 0, SIZEOF_ARRAY (mPressedKeys));
 
-    mToggleFSModeTimer = new QTimer (this);
-    mToggleFSModeTimer->setSingleShot (true);
-    connect (mToggleFSModeTimer, SIGNAL (timeout()),
-             this, SIGNAL (resizeHintDone()));
-
     /* setup rendering */
 
@@ -1058 +1053 @@
                 LogFlow (("VBoxDefs::ResizeEventType: %d x %d x %d bpp\n",
                           re->width(), re->height(), re->bitsPerPixel()));
-
-                if (mToggleFSModeTimer->isActive())
-                    mToggleFSModeTimer->stop();
 
                 /* do frame buffer dependent resize */
@@ -2245 +2237 @@
         doResizeHint (newSize);
     }
-    mToggleFSModeTimer->start (2000);
 }