Changeset 97975 in vbox

Timestamp:

Jan 4, 2023 11:28:02 AM (2 years ago)

Author:

vboxsync

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

155066

Message:

FE/Qt: Runtime UI: Small cleanup for guest auto-resize stuff.

Location:

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

Files:

• fullscreen/UIMachineViewFullscreen.cpp (modified) (3 diffs)
• fullscreen/UIMachineViewFullscreen.h (modified) (2 diffs)
• normal/UIMachineViewNormal.cpp (modified) (4 diffs)
• normal/UIMachineViewNormal.h (modified) (2 diffs)

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

@@ -55 +55 @@
 UIMachineViewFullscreen::UIMachineViewFullscreen(UIMachineWindow *pMachineWindow, ulong uScreenId)
     : UIMachineView(pMachineWindow, uScreenId)
-    , m_bIsGuestAutoresizeEnabled(actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->isChecked())
+    , m_fGuestAutoresizeEnabled(actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->isChecked())
 {
 }
@@ -123 +123 @@
 void UIMachineViewFullscreen::setGuestAutoresizeEnabled(bool fEnabled)
 {
-    if (m_bIsGuestAutoresizeEnabled != fEnabled)
-    {
-        m_bIsGuestAutoresizeEnabled = fEnabled;
-
-        if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
+    if (m_fGuestAutoresizeEnabled != fEnabled)
+    {
+        m_fGuestAutoresizeEnabled = fEnabled;
+
+        if (m_fGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
             sltPerformGuestResize();
     }
@@ -186 +186 @@
     if (fAdjust)
     {
-        if (!m_bIsGuestAutoresizeEnabled)
+        if (!m_fGuestAutoresizeEnabled)
         {
             LogRel2(("GUI: UIMachineViewFullscreen::adjustGuestScreenSize: Guest-screen auto-resize is disabled, adjustment is omitted.\n"));

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

@@ -67 +67 @@
 
     /** Returns whether the guest-screen auto-resize is enabled. */
-    virtual bool isGuestAutoresizeEnabled() const RT_OVERRIDE { return m_bIsGuestAutoresizeEnabled; }
+    virtual bool isGuestAutoresizeEnabled() const RT_OVERRIDE { return m_fGuestAutoresizeEnabled; }
     /** Defines whether the guest-screen auto-resize is @a fEnabled. */
     virtual void setGuestAutoresizeEnabled(bool bEnabled) RT_OVERRIDE;
@@ -79 +79 @@
 
     /* Private variables: */
-    bool m_bIsGuestAutoresizeEnabled : 1;
+    bool m_fGuestAutoresizeEnabled : 1;
 
     /* Friend classes: */

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

@@ -49 +49 @@
 UIMachineViewNormal::UIMachineViewNormal(UIMachineWindow *pMachineWindow, ulong uScreenId)
     : UIMachineView(pMachineWindow, uScreenId)
-    , m_bIsGuestAutoresizeEnabled(actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->isChecked())
+    , m_fGuestAutoresizeEnabled(actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->isChecked())
 {
 }
@@ -69 +69 @@
                 setMaxGuestSize();
                 /* And resize guest to current window size: */
-                if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
+                if (m_fGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
                     QTimer::singleShot(300, this, SLOT(sltPerformGuestResize()));
                 break;
@@ -137 +137 @@
 void UIMachineViewNormal::setGuestAutoresizeEnabled(bool fEnabled)
 {
-    if (m_bIsGuestAutoresizeEnabled != fEnabled)
-    {
-        m_bIsGuestAutoresizeEnabled = fEnabled;
-
-        if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
+    if (m_fGuestAutoresizeEnabled != fEnabled)
+    {
+        m_fGuestAutoresizeEnabled = fEnabled;
+
+        if (m_fGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
             sltPerformGuestResize();
     }
@@ -215 +215 @@
      * or the guest-additions doesn't support graphics
      * we should take scroll-bars size-hints into account: */
-    if (!m_bIsGuestAutoresizeEnabled || !uisession()->isGuestSupportsGraphics())
+    if (!m_fGuestAutoresizeEnabled || !uisession()->isGuestSupportsGraphics())
     {
         if (verticalScrollBar()->isVisible())

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

@@ -67 +67 @@
 
     /** Returns whether the guest-screen auto-resize is enabled. */
-    virtual bool isGuestAutoresizeEnabled() const RT_OVERRIDE { return m_bIsGuestAutoresizeEnabled; }
+    virtual bool isGuestAutoresizeEnabled() const RT_OVERRIDE { return m_fGuestAutoresizeEnabled; }
     /** Defines whether the guest-screen auto-resize is @a fEnabled. */
     virtual void setGuestAutoresizeEnabled(bool bEnabled) RT_OVERRIDE;
@@ -83 +83 @@
 
     /* Private members: */
-    bool m_bIsGuestAutoresizeEnabled : 1;
+    bool m_fGuestAutoresizeEnabled : 1;
 
     /* Friend classes: */