Changeset 2736 in vbox for trunk/src

Timestamp:

May 21, 2007 2:41:11 PM (18 years ago)

Author:

vboxsync

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

21337

Message:

1. Messages for “your additions are outdated” and “there is a newer additions version” moved into ProblemReporter class.
2. AutoResize event class replaced with zero-single-shot timer with the required slot for the exiting from full-screen and maximized modes.
3. mIsAutoresizeEnabled flag replaced with mIsAdditionsActive which reflects the guest additions status and might be useful in different places to point up are additions activated or not. Currently it is used in "auto-resize mode active possibility" determination.
4. Linux SDL Full-screen mode entering issue (screen is not refreshed in case of there is no changes on the screen and auto-resize mode is off) fixed.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (3 diffs)
• include/VBoxConsoleWnd.h (modified) (1 diff)
• include/VBoxDefs.h (modified) (1 diff)
• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (9 diffs)
• src/VBoxConsoleWnd.cpp (modified) (7 diffs)
• src/VBoxProblemReporter.cpp (modified) (2 diffs)

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

@@ -49 +49 @@
 class QMenuData;
 
-/** Auto-resize event.
-  * Useful for posting into events queue to be processed just after all
-  * QEvent::Resize & QEvent::WindowStateChange events currently posted.
-  * This is necessary due to these two events - QEvent::Resize &
-  * QEvent::WindowStateChange are processed in different sequence
-  * under Win32 and X11. */
-class AutoResizeEvent : public QEvent
-{
-public:
-    AutoResizeEvent () :
-        QEvent ((QEvent::Type) VBoxDefs::AutoResizeEventType) {}
-};
-
 class VBoxConsoleView : public QScrollView
 {
@@ -183 +170 @@
     static void dimImage (QImage &img);
 
-    void performAutoResize();
-
 private slots:
+
+    void exitFullScreen();
 
     void doResizeHint();
@@ -218 +205 @@
 
     bool ignore_mainwnd_resize : 1;
-    bool autoresize_guest : 1;
+    bool mAutoresizeGuest : 1;
+
+    bool mIsAdditionsActive;
 
     bool mfNumLock : 1;

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

@@ -249 +249 @@
     CSession csession;
 
-    bool mIsAutoresizeEnabled;
-
     // widgets
     VBoxConsoleView *console;

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

@@ -129 +129 @@
         MachineStateChangeEventType,
         AdditionsStateChangeEventType,
-        AutoResizeEventType,
         MachineDataChangeEventType,
         MachineRegisteredEventType,

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

@@ -200 +200 @@
     bool confirmReleaseImage (QWidget*, QString);
 
+    void warnAboutOldAdditions (QWidget*, const QString &);
+    void warnAboutNewAdditions (QWidget*, const QString &);
+
     bool remindAboutInputCapture();
     bool remindAboutAutoCapture();

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

@@ -458 +458 @@
     , hostkey_alone (false)
     , ignore_mainwnd_resize (false)
-    , autoresize_guest (false)
+    , mAutoresizeGuest (false)
+    , mIsAdditionsActive (false)
     , mfNumLock (false)
     , mfScrollLock (false)
@@ -769 +770 @@
 void VBoxConsoleView::setAutoresizeGuest (bool on)
 {
-    if (autoresize_guest != on)
-    {
-        autoresize_guest = on;
-
-        if (on)
-        {
-            if (mode == VBoxDefs::SDLMode)
+    if (mAutoresizeGuest != on)
+    {
+        mAutoresizeGuest = on;
+
+        if (mode == VBoxDefs::SDLMode)
+        {
+            /* restrict minimum size because we cannot correctly draw
+             * in a scrolled window using SDL */
+            if (!mAutoresizeGuest)
+                setMinimumSize (sizeHint());
+            else
                 setMinimumSize (0, 0);
-
+        }
+
+        if (mIsAdditionsActive && mAutoresizeGuest)
             doResizeHint();
-        }
-        else
-        {
-            /* restrict minimum size because we cannot correctly draw in a
-             * scrolled window using SDL */
-            if (mode == VBoxDefs::SDLMode)
-                setMinimumSize (sizeHint());
-        }
     }
 }
@@ -848 +847 @@
                     /* restrict minimum size because we cannot correctly draw
                      * in a scrolled window using SDL */
-                    if (!autoresize_guest)
+                    if (!mAutoresizeGuest)
                         setMinimumSize (sizeHint());
                     else
@@ -938 +937 @@
                 GuestAdditionsEvent *ge = (GuestAdditionsEvent *) e;
                 LogFlowFunc (("AdditionsStateChangeEventType\n"));
+                mIsAdditionsActive = ge->additionActive();
                 emit additionsStateChanged (ge->additionVersion(), ge->additionActive());
                 return true;
@@ -1031 +1031 @@
             }
 
-            case VBoxDefs::AutoResizeEventType:
-            {
-                performAutoResize();
-                return true;
-            }
-
             default:
                 break;
@@ -1136 +1130 @@
                 if (!ignore_mainwnd_resize)
                 {
-                    if (autoresize_guest)
+                    if (mIsAdditionsActive && mAutoresizeGuest)
                         resize_hint_timer->start (300, TRUE);
                     /* During window maximization WindowStateChange event is
@@ -1155 +1149 @@
                     !mainwnd->isMaximized() &&
                     !mainwnd->isTrueFullscreen())
-                    QApplication::postEvent (this, new AutoResizeEvent ());
+                    QTimer::singleShot (0, this, SLOT (exitFullScreen()));
             }
 
@@ -1705 +1699 @@
 }
 
-void VBoxConsoleView::performAutoResize()
-{
-    if (autoresize_guest)
+/**
+ *  Called on every exit from fullscreen and maximized mode.
+ */
+void VBoxConsoleView::exitFullScreen()
+{
+    if (mIsAdditionsActive && mAutoresizeGuest)
     {
         doResizeHint();
@@ -2878 +2875 @@
 void VBoxConsoleView::doResizeHint()
 {
-    if (autoresize_guest)
+    if (mIsAdditionsActive && mAutoresizeGuest)
     {
         /* Get the available size for the guest display.

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

@@ -216 +216 @@
     , dbgMenu (NULL)
 #endif
-    , mIsAutoresizeEnabled (false)
     , console (0)
     , mUsbLedTip (0)
@@ -726 +725 @@
         str = cmachine.GetExtraData (GUI_AutoresizeGuest);
         if (str != "off")
-            mIsAutoresizeEnabled = true;
+            vmAutoresizeGuestAction->setOn (true);
 
         str = cmachine.GetExtraData (GUI_LastWindowPosition);
@@ -1711 +1710 @@
     bool wasHidden = isHidden();
 
+    static QSize prevMinimumSize;
     if (on)
     {
+        /* Save previous scroll-view minimum size before entering fullscreen
+         * state to make return to this minimum size before the exiting
+         * fullscreen. Required for correct scroll-view update in SDL mode. */
+        prevMinimumSize = console->minimumSize();
+        console->setMinimumSize (0, 0);
+
         /* memorize the maximized state */
         was_max = isMaximized();
@@ -1760 +1766 @@
     else
     {
+        /* Returns to previous scroll-view minimum size before the exiting
+         * fullscreen. Required for correct scroll-view update in SDL mode. */
+        console->setMinimumSize (prevMinimumSize);
+
         /* hide early to avoid extra flicker */
 #ifdef Q_WS_MAC
@@ -1788 +1798 @@
         if (was_max)
             setWindowState (windowState() | WindowMaximized);
-        QApplication::postEvent (console, new AutoResizeEvent());
+        QTimer::singleShot (0, console, SLOT (exitFullScreen()));
     }
 
@@ -2503 +2513 @@
 void VBoxConsoleWnd::updateAdditionsState (const QString &aVersion, bool aActive)
 {
-    /* mIsAutoresizeEnabled flag stores the auto-resize status loaded from the
-     * settings and used for the activation of the autoresize feature
-     * if the additions state told us here it is activated. */
     vmAutoresizeGuestAction->setEnabled (aActive);
-    vmAutoresizeGuestAction->setOn (aActive && mIsAutoresizeEnabled);
 
     /* Checking for the Guest Additions version to warn user about possible
@@ -2516 +2522 @@
 
     if (RT_HIWORD (version) < RT_HIWORD (VMMDEV_VERSION))
-        vboxProblem().message (this, VBoxProblemReporter::Warning,
-            tr ("<p>Your Guest Additions are outdated (current version: %1).</p>"
-                "<p>You must update to the latest version by choosing Devices "
-                "- Install Guest Additions.</p>").arg (fullVersion));
+        vboxProblem().warnAboutOldAdditions (this, fullVersion);
     else if (RT_HIWORD (version) == RT_HIWORD (VMMDEV_VERSION) &&
              RT_LOWORD (version) <  RT_LOWORD (VMMDEV_VERSION))
-        vboxProblem().message (this, VBoxProblemReporter::Warning,
-            tr ("<p>Your Guest Additions are outdated (current version: %1).</p>"
-                "<p>There is a newer Guest Additions version. You should update "
-                "to the latest version by choosing Devices "
-                "- Install Guest Additions.</p>").arg (fullVersion));
+        vboxProblem().warnAboutNewAdditions (this, fullVersion);
 }
 

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

@@ -37 +37 @@
 #ifdef Q_WS_MAC
 # include <qpushbutton.h>
-#endif 
+#endif
 
 #include <iprt/err.h>
@@ -1097 +1097 @@
 }
 
+void VBoxProblemReporter::warnAboutOldAdditions (QWidget *aParent,
+                                                 const QString &aVersion)
+{
+    message (aParent, VBoxProblemReporter::Warning,
+        tr ("<p>Your Guest Additions are outdated (current version: %1).</p>"
+            "<p>You must update to the latest version by choosing Devices "
+            "- Install Guest Additions.</p>").arg (aVersion));
+}
+
+void VBoxProblemReporter::warnAboutNewAdditions (QWidget *aParent,
+                                                 const QString &aVersion)
+{
+    message (aParent, VBoxProblemReporter::Warning,
+        tr ("<p>Your Guest Additions are outdated (current version: %1).</p>"
+            "<p>There is a newer Guest Additions version. You should update "
+            "to the latest version by choosing Devices "
+            "- Install Guest Additions.</p>").arg (aVersion));
+}
+
 #if defined Q_WS_WIN