Changeset 98452 in vbox for trunk/src/VBox

Timestamp:

Feb 2, 2023 5:10:37 PM (23 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: A bit more cleanup for UISession stuff related to UIFrameBuffer across whole the Runtime UI.

Location:

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

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMultiScreenLayout.cpp (modified) (2 diffs)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (3 diffs)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (2 diffs)

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

@@ -403 +403 @@
             visibleWindows.push_back(i);
     return visibleWindows;
+}
+
+QSize UIMachine::guestScreenSize(ulong uScreenId) const
+{
+    return uisession()->frameBufferSize(uScreenId);
 }
 

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

@@ -261 +261 @@
         QList<int> listOfVisibleWindows() const;
 
+        /** Returns size for guest-screen with index @a uScreenId. */
+        QSize guestScreenSize(ulong uScreenId) const;
+
         /** Returns last full-screen size for guest-screen with index @a uScreenId. */
         QSize lastFullScreenSize(ulong uScreenId) const;

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

@@ -35 +35 @@
 #include "UIActionPoolRuntime.h"
 #include "UIMachineLogic.h"
-#include "UIFrameBuffer.h"
-#include "UISession.h"
 #include "UIMachine.h"
 #include "UIMessageCenter.h"
@@ -161 +159 @@
             ULONG uHeight = 600;
             /* Try to get previous guest-screen arguments: */
-            int iGuestScreen = m_disabledGuestScreens[iGuestScreenIndex];
-            if (UIFrameBuffer *pFrameBuffer = m_pMachineLogic->uisession()->frameBuffer(iGuestScreen))
+            const int iGuestScreen = m_disabledGuestScreens.at(iGuestScreenIndex);
+            const QSize guestScreenSize = m_pMachineLogic->uimachine()->guestScreenSize(iGuestScreen);
             {
-                if (pFrameBuffer->width() > 0)
-                    uWidth = pFrameBuffer->width();
-                if (pFrameBuffer->height() > 0)
-                    uHeight = pFrameBuffer->height();
+                if (guestScreenSize.width() > 0)
+                    uWidth = guestScreenSize.width();
+                if (guestScreenSize.height() > 0)
+                    uHeight = guestScreenSize.height();
             }
             /* Re-enable guest-screen with proper resolution: */

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

@@ -299 +299 @@
     if (uScreenId < (ulong)m_frameBufferVector.size())
         m_frameBufferVector[(int)uScreenId] = pFrameBuffer;
+}
+
+QSize UISession::frameBufferSize(ulong uScreenId) const
+{
+    UIFrameBuffer *pFramebuffer = frameBuffer(uScreenId);
+    return pFramebuffer ? QSize(pFramebuffer->width(), pFramebuffer->height()) : QSize();
 }
 

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

@@ -256 +256 @@
         /** Returns existing frame-buffer vector. */
         const QVector<UIFrameBuffer*> &frameBuffers() const { return m_frameBufferVector; }
+        /** Returns frame-buffer size for screen with index @a uScreenId. */
+        QSize frameBufferSize(ulong uScreenId) const;
     /** @} */
 

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

@@ -40 +40 @@
 #include "UIMessageCenter.h"
 #include "UIMultiScreenLayout.h"
-#include "UISession.h"
 #include "UIShortcutPool.h"
 #ifdef VBOX_WS_MAC
 # include "UICocoaApplication.h"
 # include "UIExtraDataManager.h"
-# include "UIFrameBuffer.h"
 # include "VBoxUtils.h"
 # include <Carbon/Carbon.h>
@@ -777 +775 @@
             const int iWantedHostScreenIndex = hostScreenForGuestScreen((int)uScreenID);
             const int iCurrentHostScreenIndex = UIDesktopWidgetWatchdog::screenNumber(pMachineWindow);
-            const UIFrameBuffer *pFrameBuffer = uisession()->frameBuffer(uScreenID);
-            const QSize frameBufferSize(pFrameBuffer->width(), pFrameBuffer->height());
-            const QSize screenSize = gpDesktop->screenGeometry(iWantedHostScreenIndex).size();
+            const QSize guestScreenSize = uimachine()->guestScreenSize(uScreenID);
+            const QSize hostScreenSize = gpDesktop->screenGeometry(iWantedHostScreenIndex).size();
 
             /* If that window
@@ -801 +798 @@
 
             /* If that window
-             * 1. have another frame-buffer size than actually should. */
-            else if (frameBufferSize != screenSize)
+             * 1. have another size than actually should. */
+            else if (guestScreenSize != hostScreenSize)
             {
                 LogRel(("GUI: UIMachineLogicFullscreen::revalidateNativeFullScreen: "

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

@@ -43 +43 @@
 #include "UIMachineWindowFullscreen.h"
 #include "UINotificationCenter.h"
-#include "UISession.h"
 #if   defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 # include "UIMachineDefs.h"
 # include "UIMiniToolBar.h"
 #elif defined(VBOX_WS_MAC)
-# include "UIFrameBuffer.h"
 # include "VBoxUtils-darwin.h"
 # include "UICocoaApplication.h"
@@ -384 +382 @@
         if (geo.isNull())
         {
-            const UIFrameBuffer *pFrameBuffer = uisession()->frameBuffer(m_uScreenId);
-            geo = QRect(QPoint(0, 0), QSize(pFrameBuffer->width(), pFrameBuffer->height()).boundedTo(workingArea.size()));
+            const QSize guestScreenSize = uimachine()->guestScreenSize(m_uScreenId);
+            geo = QRect(QPoint(0, 0), guestScreenSize.boundedTo(workingArea.size()));
         }
         /* If normal geometry still null => use default size: */