Changeset 61982 in vbox for trunk

Timestamp:

Jul 1, 2016 2:55:11 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:5978: Runtime UI: Moving mini-toolbar logic code to UIMiniToolBar class (forgot the seamless mode, s.a. r108411).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (3 diffs)
• widgets/UIMiniToolBar.cpp (modified) (2 diffs)

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

@@ -178 +178 @@
     resize(workingArea.size());
     move(workingArea.topLeft());
-
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-    /* If there is a mini-toolbar: */
-    if (m_pMiniToolBar)
-    {
-        /* Set appropriate geometry for mini-toolbar: */
-        m_pMiniToolBar->resize(workingArea.size());
-        m_pMiniToolBar->move(workingArea.topLeft());
-    }
-#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 }
 
@@ -200 +190 @@
         !pSeamlessLogic->hasHostScreenForGuestScreen(m_uScreenId))
     {
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-        /* If there is a mini-toolbar: */
-        if (m_pMiniToolBar)
-        {
-            /* Hide mini-toolbar: */
-            m_pMiniToolBar->hide();
-        }
-#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
-
         /* Hide window: */
         hide();
@@ -223 +204 @@
         /* Show window in normal mode: */
         show();
-
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-        /* If there is a mini-toolbar: */
-        if (m_pMiniToolBar)
-        {
-            /* Show mini-toolbar in normal mode: */
-            m_pMiniToolBar->show();
-        }
-#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
         /* Adjust machine-view size if necessary: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp

@@ -604 +604 @@
 #elif defined(VBOX_WS_WIN)
 
-    /* Adjust window before showing full-screen: */
+    /* Adjust window: */
     sltAdjust();
-    showFullScreen();
+    /* Show window in necessary mode: */
+    switch (m_geometryType)
+    {
+        case GeometryType_Available: return show();
+        case GeometryType_Full:      return showFullScreen();
+    }
 
 #elif defined(VBOX_WS_X11)
 
-    /* Show window full-screen before adjusting: */
-    showFullScreen();
+    /* Show window in necessary mode: */
+    switch (m_geometryType)
+    {
+        case GeometryType_Available: return show();
+        case GeometryType_Full:      return showFullScreen();
+    }
+    /* Adjust window: */
     sltAdjust();
 
@@ -629 +639 @@
     Q_UNUSED(iHostScreen);
     /* And corresponding working area: */
-    const QRect workingArea = vboxGlobal().screenGeometry(iHostScreen);
+    QRect workingArea;
+    switch (m_geometryType)
+    {
+        case GeometryType_Available: workingArea = vboxGlobal().availableGeometry(iHostScreen); break;
+        case GeometryType_Full:      workingArea = vboxGlobal().screenGeometry(iHostScreen); break;
+    }
     Q_UNUSED(workingArea);