Changeset 97976 in vbox

Timestamp:

Jan 4, 2023 11:56:32 AM (2 years ago)

Author:

vboxsync

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

155067

Message:

FE/Qt: Runtime UI: Small cleanup for maximum guest size stuff.

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (1 diff)
• UIMachineView.cpp (modified) (8 diffs)
• UIMachineView.h (modified) (2 diffs)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (3 diffs)
• scale/UIMachineViewScale.cpp (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (1 diff)

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

@@ -1491 +1491 @@
     /* Determine if supported: */
     *pfSupported = TRUE;
-    QSize screenSize = m_pMachineView->maxGuestSize();
+    const QSize screenSize = m_pMachineView->maximumGuestSize();
     if (   (screenSize.width() != 0)
         && (uWidth > (ULONG)screenSize.width())

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

@@ -188 +188 @@
 
     /* Set a preliminary maximum size: */
-    pMachineView->setMaxGuestSize();
+    pMachineView->setMaximumGuestSize();
 
     /* Resend the last resize hint finally: */
@@ -294 +294 @@
 
     /* Update current window size limitations: */
-    setMaxGuestSize(size);
+    setMaximumGuestSize(size);
 
     /* Record the hint to extra data, needed for guests using VMSVGA:
@@ -421 +421 @@
 
         /* Update current window size limitations: */
-        setMaxGuestSize(QSize(uWidth, uHeight));
+        setMaximumGuestSize(QSize(uWidth, uHeight));
 
         /* Record the hint to extra data, needed for guests using VMSVGA:
@@ -472 +472 @@
 
     /* Update current window size limitations: */
-    setMaxGuestSize(size);
+    setMaximumGuestSize(size);
 
     /* Record the hint to extra data, needed for guests using VMSVGA:
@@ -661 +661 @@
 void UIMachineView::sltDesktopResized()
 {
-    setMaxGuestSize();
+    setMaximumGuestSize();
 }
 
@@ -841 +841 @@
     , m_iHostScreenNumber(0)
     , m_enmMaximumGuestScreenSizePolicy(MaximumGuestScreenSizePolicy_Automatic)
-    , m_u64MaxGuestSize(0)
+    , m_u64MaximumGuestSize(0)
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
     , m_fIsDraggingFromGuest(false)
@@ -1215 +1215 @@
 }
 
-void UIMachineView::setMaxGuestSize(const QSize &minimumSizeHint /* = QSize() */)
+void UIMachineView::setMaximumGuestSize(const QSize &minimumSizeHint /* = QSize() */)
 {
     QSize maxSize;
@@ -1230 +1230 @@
             maxSize = QSize(0, 0);
     }
-    ASMAtomicWriteU64(&m_u64MaxGuestSize,
+    ASMAtomicWriteU64(&m_u64MaximumGuestSize,
                       RT_MAKE_U64(maxSize.height(), maxSize.width()));
 }
 
-QSize UIMachineView::maxGuestSize()
-{
-    uint64_t u64Size = ASMAtomicReadU64(&m_u64MaxGuestSize);
+QSize UIMachineView::maximumGuestSize()
+{
+    uint64_t u64Size = ASMAtomicReadU64(&m_u64MaximumGuestSize);
     return QSize(int(RT_HI_U32(u64Size)), int(RT_LO_U32(u64Size)));
 }

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

@@ -223 +223 @@
     ulong screenId() const { return m_uScreenId; }
     UIFrameBuffer* frameBuffer() const { return m_pFrameBuffer; }
+
     /** Atomically store the maximum guest resolution which we currently wish
-     * to handle for @a maxGuestSize() to read.  Should be called if anything
+     * to handle for @a maximumGuestSize() to read.  Should be called if anything
      * happens (e.g. a screen hotplug) which might cause the value to change.
-     * @sa m_u64MaxGuestSize. */
-    void setMaxGuestSize(const QSize &minimumSizeHint = QSize());
+     * @sa m_u64MaximumGuestSize. */
+    void setMaximumGuestSize(const QSize &minimumSizeHint = QSize());
     /** Atomically read the maximum guest resolution which we currently wish to
      * handle.  This may safely be called from another thread (called by
      * UIFramebuffer on EMT).
-     * @sa m_u64MaxGuestSize. */
-    QSize maxGuestSize();
+     * @sa m_u64MaximumGuestSize. */
+    QSize maximumGuestSize();
 
     /** Retrieves the last guest-screen visibility status from extra-data. */
@@ -401 +402 @@
      */
     /** @todo This should be private. */
-    volatile uint64_t m_u64MaxGuestSize;
+    volatile uint64_t m_u64MaximumGuestSize;
 
     /** Holds the pause-pixmap. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -77 +77 @@
                     break;
 
-                /* Recalculate max guest size: */
-                setMaxGuestSize();
+                /* Recalculate maximum guest size: */
+                setMaximumGuestSize();
 
                 break;

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

@@ -66 +66 @@
             case QEvent::Resize:
             {
-                /* Recalculate max guest size: */
-                setMaxGuestSize();
+                /* Recalculate maximum guest size: */
+                setMaximumGuestSize();
                 /* And resize guest to current window size: */
                 if (m_fGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
@@ -158 +158 @@
 
     /* Expand current limitations: */
-    setMaxGuestSize(sizeHint);
+    setMaximumGuestSize(sizeHint);
 
     /* Temporarily restrict the size to prevent a brief resize to the
@@ -201 +201 @@
 
     /* Adjust guest-screen size if the last size hint is too big for the screen: */
-    const QSize maxGuestSize = calculateMaxGuestSize();
-    if (   maxGuestSize.width() < frameBufferSize.width()
-        || maxGuestSize.height() < frameBufferSize.height())
+    const QSize maximumGuestSize = calculateMaxGuestSize();
+    if (   maximumGuestSize.width() < frameBufferSize.width()
+        || maximumGuestSize.height() < frameBufferSize.height())
         sltPerformGuestResize(machineWindow()->centralWidget()->size());
 }

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

@@ -172 +172 @@
 
     /* Expand current limitations: */
-    setMaxGuestSize(sizeHint);
+    setMaximumGuestSize(sizeHint);
 
     /* Send saved size-hint to the guest: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -88 +88 @@
                     break;
 
-                /* Recalculate max guest size: */
-                setMaxGuestSize();
+                /* Recalculate maximum guest size: */
+                setMaximumGuestSize();
 
                 break;