VirtualBox

Ignore:
Timestamp:
Feb 1, 2023 3:00:11 PM (2 years ago)
Author:
vboxsync
Message:

Merging r155441 from gui4 branch: FE/Qt: Runtime UI: Remove modal/popup widget cleanup block from UIMachineLogic close slot; It is a part of overall close procedure in UISession/UIMachine which is used by the slot anyway; Can be dangerous?

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:mergeinfo

      •  

        old new  
        1919/branches/dsen/gui2:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        2020/branches/dsen/gui3:79645-79692
        21 /branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438
         21/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441
        2222/trunk/src:92342,154921

  • trunk/src/VBox

    • Property svn:mergeinfo

      •  

        old new  
        1919/branches/dsen/gui2/src/VBox:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        2020/branches/dsen/gui3/src/VBox:79645-79692
        21 /branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438
         21/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441

  • trunk/src/VBox/Frontends

    • Property svn:mergeinfo

      •  

        old new  
        1616/branches/dsen/gui2/src/VBox/Frontends:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        1717/branches/dsen/gui3/src/VBox/Frontends:79645-79692
        18 /branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438
         18/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441

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

    r98400 r98403  
    15341534    if (!isMachineWindowsCreated())
    15351535        return;
    1536 
    15371536    /* Do not close machine-window in 'manual-override' mode: */
    15381537    if (uisession()->isManualOverrideMode())
    15391538        return;
    1540 
    1541     /* First, we have to close/hide any opened modal & popup application widgets.
    1542      * We have to make sure such window is hidden even if close-event was rejected.
    1543      * We are re-throwing this slot if any widget present to test again.
    1544      * If all opened widgets are closed/hidden, we can try to close machine-window: */
    1545     QWidget *pWidget = QApplication::activeModalWidget() ? QApplication::activeModalWidget() :
    1546                        QApplication::activePopupWidget() ? QApplication::activePopupWidget() : 0;
    1547     if (pWidget)
    1548     {
    1549         /* Closing/hiding all we found: */
    1550         pWidget->close();
    1551         if (!pWidget->isHidden())
    1552             pWidget->hide();
    1553         QTimer::singleShot(0, this, SLOT(sltClose()));
    1554         return;
    1555     }
    15561539
    15571540    /* Try to close active machine-window: */
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette