Changeset 103539 in vbox

Timestamp:

Feb 22, 2024 6:27:15 PM (9 months ago)

Author:

vboxsync

Message:

FE/Qt: macOS: Runtime UI: Rework the way how machine-windows being restored from minimized state on Show action triggering; Removing obsolete Qt3 workaround dead for years from UIDefs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDefs.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (1 diff)
• runtime/UIMachineView.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

@@ -47 +47 @@
     {
         ActivateActionEventType = QEvent::User + 101,
-#ifdef VBOX_WS_MAC
-        ShowWindowEventType,
-#endif
     };
 

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

@@ -680 +680 @@
 {
     for (int i=0; i < machineWindows().size(); ++i)
-    {
-        UIMachineWindow *pMachineWindow = machineWindows().at(i);
-        /* Dunno what Qt thinks a window that has minimized to the dock
-         * should be - it is not hidden, neither is it minimized. OTOH it is
-         * marked shown and visible, but not activated. This latter isn't of
-         * much help though, since at this point nothing is marked activated.
-         * I might have overlooked something, but I'm buggered what if I know
-         * what. So, I'll just always show & activate the stupid window to
-         * make it get out of the dock when the user wishes to show a VM. */
-        pMachineWindow->raise();
-        pMachineWindow->activateWindow();
-    }
+        UIDesktopWidgetWatchdog::restoreWidget(machineWindows().at(i));
 }
 #endif /* VBOX_WS_MAC */

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

@@ -1759 +1759 @@
 }
 
-bool UIMachineView::event(QEvent *pEvent)
-{
-    switch ((UIEventType)pEvent->type())
-    {
-#ifdef VBOX_WS_MAC
-        /* Event posted OnShowWindow: */
-        case ShowWindowEventType:
-        {
-            /* Dunno what Qt3 thinks a window that has minimized to the dock should be - it is not hidden,
-             * neither is it minimized. OTOH it is marked shown and visible, but not activated.
-             * This latter isn't of much help though, since at this point nothing is marked activated.
-             * I might have overlooked something, but I'm buggered what if I know what. So, I'll just always
-             * show & activate the stupid window to make it get out of the dock when the user wishes to show a VM: */
-            window()->show();
-            window()->activateWindow();
-            return true;
-        }
-#endif /* VBOX_WS_MAC */
-
-        default:
-            break;
-    }
-
-    return QAbstractScrollArea::event(pEvent);
-}
-
 bool UIMachineView::eventFilter(QObject *pWatched, QEvent *pEvent)
 {

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

@@ -314 +314 @@
 
     /* Cross-platforms event processors: */
-    bool event(QEvent *pEvent);
     bool eventFilter(QObject *pWatched, QEvent *pEvent);
     void resizeEvent(QResizeEvent *pEvent);