Changeset 8219 in vbox

Timestamp:

Apr 21, 2008 11:47:41 AM (17 years ago)

Author:

vboxsync

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

29938

Message:

Frontends/VirtualBox3/4: removed responsibility for remembering the last guest resolution from the GUI again

Location:

trunk/src/VBox/Frontends

Files:

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

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

@@ -198 +198 @@
 
     void setDesktopGeometry(int minWidth, int minHeight);
-    void sendInitialSizeHint(void);
     void maybeRestrictMinimumSize();
 
@@ -285 +284 @@
     CGImageRef mVirtualBoxLogo;
 #endif
-    QSize mLastSizeHint;
     QRect mDesktopGeometry;
 };

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

@@ -169 +169 @@
     static const char* GUI_LastVMSelected;
     static const char* GUI_InfoDlgState;
-    static const char* GUI_LastSizeHint;
 };
 

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

@@ -1075 +1075 @@
                     updateGeometry();
 
-                /* Remember the new size for sending an initial size hint
-                   on next power up. */
-                if (mConsole.GetGuest().GetSupportsGraphics())
-                    mLastSizeHint = QSize(re->width(), re->height());
-
                 /* make sure that all posted signals are processed */
                 qApp->processEvents();
@@ -2856 +2851 @@
                 }
             }
-            else if (mLastState == KMachineState_Starting)
-            {
-                /* Suggest an initial size. */
-                sendInitialSizeHint ();
-            }
             /* reuse the focus event handler to capture input */
             if (hasFocus())
                 focusEvent (true /* aHasFocus */);
             break;
-        }
-        case KMachineState_Stopping:
-        {
-            if (mLastSizeHint.isValid())
-            {
-                CMachine cmachine = mConsole.GetMachine();
-                QString str = QString ("%1,%2")
-                                      .arg (mLastSizeHint.width())
-                                      .arg (mLastSizeHint.height());
-                cmachine.SetExtraData (VBoxDefs::GUI_LastSizeHint, str);
-            }
         }
         default:
@@ -3558 +3537 @@
 
 /**
- * We send an initial size hint to the VM on startup, based on the last
- * resize event in the last session (if any).
- */
-void VBoxConsoleView::sendInitialSizeHint(void)
-{
-    CMachine cmachine = mConsole.GetMachine();
-    QString str = cmachine.GetExtraData (VBoxDefs::GUI_LastSizeHint);
-    int w = 0, h = 0;
-    bool ok = true;
-    w = str.section (',', 0, 0).toInt (&ok);
-    if (ok)
-        h = str.section (',', 1, 1).toInt (&ok);
-    QRect screen = QApplication::desktop()->screenGeometry (this);
-    if (ok && w <= screen.width() && h <= screen.height())
-    {
-        LogFlowFunc (("Will suggest %d x %d\n", w, h));
-        mConsole.GetDisplay().SetVideoModeHint (w, h, 0, 0);
-    }
-}
-
-/**
  *  Sets the the minimum size restriction depending on the auto-resize feature
  *  state and the current rendering mode.

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

@@ -40 +40 @@
 const char* VBoxDefs::GUI_LastVMSelected = "GUI/LastVMSelected";
 const char* VBoxDefs::GUI_InfoDlgState = "GUI/InfoDlgState";
-const char* VBoxDefs::GUI_LastSizeHint = "GUI/LastSizeHint";

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

@@ -216 +216 @@
 
     void setDesktopGeometry(int minWidth, int minHeight);
-    void sendInitialSizeHint(void);
     void maybeRestrictMinimumSize();
 
@@ -302 +301 @@
     CGImageRef mVirtualBoxLogo;
 #endif
-    QSize mLastSizeHint;
     QRect mDesktopGeometry;
 };

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

@@ -169 +169 @@
     static const char* GUI_LastVMSelected;
     static const char* GUI_InfoDlgState;
-    static const char* GUI_LastSizeHint;
 };
 

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

@@ -40 +40 @@
 const char* VBoxDefs::GUI_LastVMSelected = "GUI/LastVMSelected";
 const char* VBoxDefs::GUI_InfoDlgState = "GUI/InfoDlgState";
-const char* VBoxDefs::GUI_LastSizeHint = "GUI/LastSizeHint";