Changeset 102556 in vbox

Timestamp:

Dec 8, 2023 5:17:43 PM (15 months ago)

Author:

vboxsync

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

160702

Message:

FE/Qt: bugref:10570: UIMachineLogic: A bit of cleanup/rework for Session Information and Soft Keyboard dialogs startup procedure.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (2 diffs)

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

@@ -1657 +1657 @@
         return;
 
+    /* Create instance if not yet created: */
     if (!m_pVMInformationDialog)
+    {
         m_pVMInformationDialog = new UIVMInformationDialog;
-
-    if (m_pVMInformationDialog)
-    {
-        m_pVMInformationDialog->show();
-        m_pVMInformationDialog->raise();
-        m_pVMInformationDialog->setWindowState(m_pVMInformationDialog->windowState() & ~Qt::WindowMinimized);
-        m_pVMInformationDialog->activateWindow();
         connect(m_pVMInformationDialog, &UIVMInformationDialog::sigClose,
                 this, &UIMachineLogic::sltCloseInformationDialog);
     }
+
+    /* Expose instance: */
+    UIDesktopWidgetWatchdog::restoreWidget(m_pVMInformationDialog);
 }
 
@@ -2033 +2031 @@
 void UIMachineLogic::sltShowSoftKeyboard()
 {
-    if (!activeMachineWindow())
-        return;
-
+    /* Do not process if window(s) missed! */
+    if (!isMachineWindowsCreated())
+        return;
+
+    /* Create instance if not yet created: */
     if (!m_pSoftKeyboardDialog)
     {
-        QWidget *pCenterWidget = windowManager().realParentWindow(activeMachineWindow());
-        m_pSoftKeyboardDialog = new UISoftKeyboard(0, uimachine(), pCenterWidget, uimachine()->machineName());
+        m_pSoftKeyboardDialog = new UISoftKeyboard(0, uimachine(), activeMachineWindow(), uimachine()->machineName());
         connect(m_pSoftKeyboardDialog, &UISoftKeyboard::sigClose,
                 this, &UIMachineLogic::sltCloseSoftKeyboard);
     }
 
-    if (m_pSoftKeyboardDialog)
-    {
-        m_pSoftKeyboardDialog->show();
-        m_pSoftKeyboardDialog->raise();
-        m_pSoftKeyboardDialog->setWindowState(m_pSoftKeyboardDialog->windowState() & ~Qt::WindowMinimized);
-        m_pSoftKeyboardDialog->activateWindow();
-    }
+    /* Expose instance: */
+    UIDesktopWidgetWatchdog::restoreWidget(m_pSoftKeyboardDialog);
 }