Changeset 30930 in vbox

Timestamp:

Jul 20, 2010 2:26:06 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: New running VM core: More wise positioning settings processing for normal & scale windows.

Location:

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

Files:

• normal/UIMachineWindowNormal.cpp (modified) (1 diff)
• scale/UIMachineWindowScale.cpp (modified) (1 diff)

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

@@ -517 +517 @@
         QStringList strPositionSettings = machine.GetExtraDataStringList(strPositionAddress);
 
-        bool ok = true, max = false;
+        bool ok = !strPositionSettings.isEmpty(), max = false;
         int x = 0, y = 0, w = 0, h = 0;
+
         if (ok && strPositionSettings.size() > 0)
             x = strPositionSettings[0].toInt(&ok);
+        else ok = false;
         if (ok && strPositionSettings.size() > 1)
             y = strPositionSettings[1].toInt(&ok);
+        else ok = false;
         if (ok && strPositionSettings.size() > 2)
             w = strPositionSettings[2].toInt(&ok);
+        else ok = false;
         if (ok && strPositionSettings.size() > 3)
             h = strPositionSettings[3].toInt(&ok);
+        else ok = false;
         if (ok && strPositionSettings.size() > 4)
             max = strPositionSettings[4] == VBoxDefs::GUI_LastWindowState_Max;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -217 +217 @@
         QStringList strPositionSettings = machine.GetExtraDataStringList(strPositionAddress);
 
-        bool ok = true, max = false;
+        bool ok = !strPositionSettings.isEmpty(), max = false;
         int x = 0, y = 0, w = 0, h = 0;
+
         if (ok && strPositionSettings.size() > 0)
             x = strPositionSettings[0].toInt(&ok);
+        else ok = false;
         if (ok && strPositionSettings.size() > 1)
             y = strPositionSettings[1].toInt(&ok);
+        else ok = false;
         if (ok && strPositionSettings.size() > 2)
             w = strPositionSettings[2].toInt(&ok);
+        else ok = false;
         if (ok && strPositionSettings.size() > 3)
             h = strPositionSettings[3].toInt(&ok);
+        else ok = false;
         if (ok && strPositionSettings.size() > 4)
             max = strPositionSettings[4] == VBoxDefs::GUI_LastWindowState_Max;