Changeset 39022 in vbox

Timestamp:

Oct 18, 2011 4:17:37 PM (13 years ago)

Author:

vboxsync

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

74430

Message:

FE/Qt: multi-monitor fix for r74363

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (4 diffs)
• UIMachineView.h (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -166 +166 @@
     /* And track whether we have had a "normal" resize since the last
      * fullscreen resize hint was sent: */
-    machine.SetExtraData(VBoxDefs::GUI_LastGuestSizeHintWasFullscreen,
-                         isFullscreenOrSeamless() ? "true" : "");
+    QString strKey = makeExtraDataKeyPerMonitor
+                         (VBoxDefs::GUI_LastGuestSizeHintWasFullscreen);
+    machine.SetExtraData(strKey, isFullscreenOrSeamless() ? "true" : "");
 }
 
@@ -625 +626 @@
 
     /* Load machine view hint: */
-    QString strKey = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastGuestSizeHint) :
-                     QString("%1%2").arg(VBoxDefs::GUI_LastGuestSizeHint).arg(m_uScreenId);
+    QString strKey = makeExtraDataKeyPerMonitor
+                         (VBoxDefs::GUI_LastGuestSizeHint);
     QString strValue = machine.GetExtraData(strKey);
 
@@ -692 +693 @@
 
     /* Save machine view hint: */
-    QString strKey = m_uScreenId == 0 ? QString("%1").arg(VBoxDefs::GUI_LastGuestSizeHint) :
-                     QString("%1%2").arg(VBoxDefs::GUI_LastGuestSizeHint).arg(m_uScreenId);
+    QString strKey = makeExtraDataKeyPerMonitor
+                         (VBoxDefs::GUI_LastGuestSizeHint);
     QString strValue = QString("%1,%2").arg(sizeHint.width()).arg(sizeHint.height());
     machine.SetExtraData(strKey, strValue);
@@ -909 +910 @@
     return    type == UIVisualStateType_Fullscreen
            || type == UIVisualStateType_Fullscreen;
+}
+
+QString UIMachineView::makeExtraDataKeyPerMonitor(QString base) const
+{
+    return m_uScreenId == 0 ? QString("%1").arg(base)
+                            : QString("%1%2").arg(base).arg(m_uScreenId);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -182 +182 @@
     /** Is this a fullscreen-type view? */
     bool isFullscreenOrSeamless();
+    QString makeExtraDataKeyPerMonitor(QString base) const;
 
     /* Cross-platforms event processors: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -219 +219 @@
         /* We send a guest size hint if needed to reverse a transition
          * to fullscreen or seamless. */
-        QString strHintSent = machine.GetExtraData(VBoxDefs::GUI_LastGuestSizeHintWasFullscreen);
+        QString strKey = makeExtraDataKeyPerMonitor
+                             (VBoxDefs::GUI_LastGuestSizeHintWasFullscreen);
+        QString strHintSent = machine.GetExtraData(strKey);
         if (!strHintSent.isEmpty())
             sltPerformGuestResize(guestSizeHint());